diff options
32 files changed, 1926 insertions, 253 deletions
diff --git a/asm/trade.s b/asm/trade.s index 5467aec2f..6e5f333ae 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 @@ -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 @@ -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 Binary files differindex 418050676..02b5aab21 100644 --- a/baserom.ips +++ b/baserom.ips diff --git a/data/data.s b/data/data.s deleted file mode 100644 index b19173bc6..000000000 --- a/data/data.s +++ /dev/null @@ -1,214 +0,0 @@ -#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_8260834:: @ 8260834 - .incbin "baserom.gba", 0x260834, 0x1FE - -gUnknown_8260A32:: @ 8260A32 - .incbin "baserom.gba", 0x260A32, 0x1FE - -gUnknown_8260C30:: @ 8260C30 - .incbin "baserom.gba", 0x260C30, 0x800 - -gUnknown_8261430:: @ 8261430 - .incbin "baserom.gba", 0x261430, 0x828 - -gUnknown_8261C58:: @ 8261C58 - .incbin "baserom.gba", 0x261C58, 0x8 - -gUnknown_8261C60:: @ 8261C60 - .incbin "baserom.gba", 0x261C60, 0x50 - -gUnknown_8261CB0:: @ 8261CB0 - .incbin "baserom.gba", 0x261CB0, 0x18 - -gUnknown_8261CC8:: @ 8261CC8 - .incbin "baserom.gba", 0x261CC8, 0x38 - -gUnknown_8261D00:: @ 8261D00 - .incbin "baserom.gba", 0x261D00, 0x8 - -gUnknown_8261D08:: @ 8261D08 - .incbin "baserom.gba", 0x261D08, 0x138 - -gUnknown_8261E40:: @ 8261E40 - .incbin "baserom.gba", 0x261E40, 0x1A - -gUnknown_8261E5A:: @ 8261E5A - .incbin "baserom.gba", 0x261E5A, 0x18 - -gUnknown_8261E72:: @ 8261E72 - .incbin "baserom.gba", 0x261E72, 0x18 - -gUnknown_8261E8A:: @ 8261E8A - .incbin "baserom.gba", 0x261E8A, 0x2C - -gUnknown_8261EB6:: @ 8261EB6 - .incbin "baserom.gba", 0x261EB6, 0xB - -gText_MaleSymbol4:: @ 8261EC1 - .incbin "baserom.gba", 0x261EC1, 0x2 - -gText_FemaleSymbol4:: @ 8261EC3 - .incbin "baserom.gba", 0x261EC3, 0x2 - -gText_GenderlessSymbol:: @ 8261EC5 - .incbin "baserom.gba", 0x261EC5, 0x2 - -gUnknown_8261EC7:: @ 8261EC7 - .incbin "baserom.gba", 0x261EC7, 0x5 - -gUnknown_8261ECC:: @ 8261ECC - .incbin "baserom.gba", 0x261ECC, 0x18 - -gUnknown_8261EE4:: @ 8261EE4 - .incbin "baserom.gba", 0x261EE4, 0x10 - -gUnknown_8261EF4:: @ 8261EF4 - .incbin "baserom.gba", 0x261EF4, 0x24 - -gUnknown_8261F18:: @ 8261F18 - .incbin "baserom.gba", 0x261F18, 0x4 - -gUnknown_8261F1C:: @ 8261F1C - .incbin "baserom.gba", 0x261F1C, 0x10 - -gUnknown_8261F2C:: @ 8261F2C - .incbin "baserom.gba", 0x261F2C, 0x98 - -gUnknown_8261FC4:: @ 8261FC4 - .incbin "baserom.gba", 0x261FC4, 0x70 - -gUnknown_8262034:: @ 8262034 - .incbin "baserom.gba", 0x262034, 0x21 - -gUnknown_8262055:: @ 8262055 - .incbin "baserom.gba", 0x262055, 0x2027 - -gUnknown_826407C:: @ 826407C - .incbin "baserom.gba", 0x26407C, 0x1FA0 - -gUnknown_08331F60:: @ 826601C - .incbin "baserom.gba", 0x26601C, 0x1000 - -gUnknown_826701C:: @ 826701C - .incbin "baserom.gba", 0x26701C, 0x2840 - -gUnknown_826985C:: @ 826985C - .incbin "baserom.gba", 0x26985C, 0x100 - -gUnknown_826995C:: @ 826995C - .incbin "baserom.gba", 0x26995C, 0x100 - -gUnknown_8269A5C:: @ 8269A5C - .incbin "baserom.gba", 0x269A5C, 0x1000 - -gUnknown_826AA5C:: @ 826AA5C - .incbin "baserom.gba", 0x26AA5C, 0x1000 - - .align 2 -gUnknown_3379A0Bin:: @ 826BA5C - .incbin "graphics/trade/unknown_3379A0.bin.lz" - -gUnknown_826BB5C:: @ 826BB5C - .incbin "baserom.gba", 0x26BB5C, 0x200 - -gUnknown_826BD5C:: @ 826BD5C - .incbin "baserom.gba", 0x26BD5C, 0x200 - -gUnknown_826BF5C:: @ 826BF5C - .incbin "baserom.gba", 0x26BF5C, 0x20 - -gWirelessSignal4bpp:: @ 826BF7C - .incbin "graphics/trade/wireless_signal.4bpp.lz" - -gUnknown_826C60C:: @ 826C60C - .incbin "baserom.gba", 0x26C60C, 0x7C8 - -gUnknown_826CDD4:: @ 826CDD4 - .incbin "baserom.gba", 0x26CDD4, 0x8 - -gUnknown_826CDDC:: @ 826CDDC - .incbin "baserom.gba", 0x26CDDC, 0x8 - -gUnknown_826CDE4:: @ 826CDE4 - .incbin "baserom.gba", 0x26CDE4, 0x48 - -gUnknown_826CE2C:: @ 826CE2C - .incbin "baserom.gba", 0x26CE2C, 0x8 - -gUnknown_826CE34:: @ 826CE34 - .incbin "baserom.gba", 0x26CE34, 0x8 - -gUnknown_826CE3C:: @ 826CE3C - .incbin "baserom.gba", 0x26CE3C, 0x8 - -gUnknown_826CE44:: @ 826CE44 - .incbin "baserom.gba", 0x26CE44, 0x38 - -gUnknown_826CE7C:: @ 826CE7C - .incbin "baserom.gba", 0x26CE7C, 0x8 - -gUnknown_826CE84:: @ 826CE84 - .incbin "baserom.gba", 0x26CE84, 0x2C - -gUnknown_826CEB0:: @ 826CEB0 - .incbin "baserom.gba", 0x26CEB0, 0x8 - -gUnknown_826CEB8:: @ 826CEB8 - .incbin "baserom.gba", 0x26CEB8, 0x70 - -gUnknown_826CF28:: @ 826CF28 - .incbin "baserom.gba", 0x26CF28, 0x8 - -gUnknown_826CF30:: @ 826CF30 - .incbin "baserom.gba", 0x26CF30, 0x18 - -gUnknown_826CF48:: @ 826CF48 - .incbin "baserom.gba", 0x26CF48, 0x18 - -gUnknown_826CF60:: @ 826CF60 - .incbin "baserom.gba", 0x26CF60, 0x28 - -gUnknown_826CF88:: @ 826CF88 - .incbin "baserom.gba", 0x26CF88, 0x4 - -gUnknown_826CF8C:: @ 826CF8C - .incbin "baserom.gba", 0x26CF8C, 0x21C - -gUnknown_826D1A8:: @ 826D1A8 - .incbin "baserom.gba", 0x26D1A8, 0x14 - -gUnknown_826D1BC:: @ 826D1BC - .incbin "baserom.gba", 0x26D1BC, 0x10 - -gUnknown_826D1CC:: @ 826D1CC - .incbin "baserom.gba", 0x26D1CC, 0x8 - -gUnknown_826D1D4:: @ 826D1D4 - .incbin "baserom.gba", 0x26D1D4, 0x10 - -gUnknown_826D1E4:: @ 826D1E4 - .incbin "baserom.gba", 0x26D1E4, 0x6C - -gUnknown_826D250:: @ 826D250 - .incbin "baserom.gba", 0x26D250, 0x44 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/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/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/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 new file mode 100644 index 000000000..50cbeb488 --- /dev/null +++ b/data/trade.s @@ -0,0 +1,997 @@ +#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 + .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" + +gUnknown_8260A32:: @ 8260A32 + .incbin "data/trade/unk_8260A32.bin" + +gUnknown_8260C30:: @ 8260C30 + .incbin "data/trade/unk_8260C30.bin" + +gUnknown_8261430:: @ 8261430 + .incbin "data/trade/unk_8261430.bin" + +gOamdata_8261C30:: + .4byte 0x80004000, 0x00000400 + +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 + obj_tiles gUnknown_8E9E1DC, 0x0800, 300 + +gUnknown_8261C60:: @ 8261C60 + 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 + spr_template 300, 2345, gOamData_8261C38, gSpriteAnimTable_8261C50, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_8261CC8:: @ 8261CC8 + spr_template 200, 4925, gOamdata_8261C30, gSpriteAnimTable_8261C98, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy + +gUnknown_8261CE0:: + .incbin "data/trade/unk_8261CE0.gbapal" + +gUnknown_8261D00:: @ 8261D00 + obj_pal gUnknown_8261CE0, 4925 + +gUnknown_8261D08:: @ 8261D08 + .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 + + .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 + .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 + .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 + +gTradeUnknownSpriteCoords:: @ 8261E8A + .byte 0x3c, 0x09, 0xb4, 0x09 + .byte 0x30, 0x09, 0xa8, 0x09 + +gUnknown_8261E92:: + .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 "$" + +gUnknown_8261EB7:: + .string "{COLOR DARK_GREY}{HIGHLIGHT TRANSPARENT}{SHADOW RED}$" + +gText_MaleSymbol4:: @ 8261EC1 + .string "♂$" + +gText_FemaleSymbol4:: @ 8261EC3 + .string "♀$" + +gText_GenderlessSymbol:: @ 8261EC5 + .string "$" + +gUnknown_8261EC6:: + .string "$" + +gUnknown_8261EC7:: @ 8261EC7 + .string "\n$" + +gUnknown_8261EC9:: + .string "/$" + + .align 2 +gUnknown_8261ECC:: @ 8261ECC + .4byte gUnknown_841E0B9 + .4byte gUnknown_841E0C0 + .4byte gUnknown_841E0D2 + .4byte gUnknown_841E0DA + .4byte gUnknown_841E0E0 + .4byte gUnknown_841E0EE + +gUnknown_8261EE4:: @ 8261EE4 + .4byte gUnknown_841E10A, sub_804F440 + .4byte gUnknown_841E112, sub_804F464 + +gUnknown_8261EF4:: @ 8261EF4 + .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 + .byte 0, 1, 2 + + .align 2 +gUnknown_8261F1C:: @ 8261F1C + .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 + .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 + .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 + .string "ヌケニン$" + .string "こうかんせいりつ $" + .string "だめだたらしいよ $" + +gUnknown_8262055:: @ 8262055 + .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 "data/trade/unk_826407C.bin" + + .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 "data/trade/unk_826701C.8bpp" + +gUnknown_826985C:: @ 826985C + .incbin "data/trade/unk_826985C.bin" + +gUnknown_826995C:: @ 826995C + .incbin "data/trade/unk_826995C.bin" + +gUnknown_8269A5C:: @ 8269A5C + .incbin "data/trade/unk_8269A5C.bin" + +gUnknown_826AA5C:: @ 826AA5C + .incbin "data/trade/unk_826AA5C.bin" + + .align 2 +gUnknown_3379A0Bin:: @ 826BA5C + .incbin "graphics/trade/unknown_3379A0.bin.lz" + +gUnknown_826BB5C:: @ 826BB5C + .incbin "data/trade/unk_826BB5C.gbapal" + +gUnknown_826BD5C:: @ 826BD5C + .incbin "data/trade/unk_826BD5C.gbapal" + +gUnknown_826BF5C:: @ 826BF5C + .incbin "data/trade/unk_826BF5C.gbapal" + +gWirelessSignal4bpp:: @ 826BF7C + .incbin "graphics/trade/wireless_signal.4bpp.lz" + +gUnknown_826C60C:: @ 826C60C + .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 + obj_tiles gUnknown_826207C, 0x0600, 5557 + +gUnknown_826CDDC:: @ 826CDDC + obj_pal gUnknown_826205C, 5558 + +gUnknown_826CDE4:: @ 826CDE4 + 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 + obj_tiles gUnknown_8264A1C, 0x0200, 5550 + +gUnknown_826CE34:: @ 826CE34 + obj_pal gUnknown_82649FC, 5551 + +gUnknown_826CE3C:: @ 826CE3C + obj_pal gUnknown_826499C, 5555 + +gUnknown_826CE44:: @ 826CE44 + 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 + obj_tiles gUnknown_8264C1C, 0x0300, 5552 + +gUnknown_826CE84:: @ 826CE84 + 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 + obj_tiles gUnknown_8264E1C, 0x0100, 5554 + +gUnknown_826CEB8:: @ 826CEB8 + 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 + obj_tiles gUnknown_826501C, 0x1000, 5556 + +gUnknown_826CF30:: @ 826CF30 + spr_template 5556, 5555, gOamData_826CED0, gSpriteAnimTable_826CF20, NULL, gDummySpriteAffineAnimTable, sub_804FE00 + +gUnknown_826CF48:: @ 826CF48 + spr_template 5556, 5555, gOamData_826CED0, gSpriteAnimTable_826CF24, NULL, gDummySpriteAffineAnimTable, sub_804FE00 + +gUnknown_826CF60:: @ 826CF60 + .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 + .4byte gAffineAnimCmd_826CF78 + + .include "data/ingame_trades.inc" + +gUnknown_826D1BC:: @ 826D1BC + .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 + .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 + .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 + .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 + .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_8260834.bin b/data/trade/unk_8260834.bin Binary files differnew file mode 100644 index 000000000..123abf716 --- /dev/null +++ b/data/trade/unk_8260834.bin diff --git a/data/trade/unk_8260A32.bin b/data/trade/unk_8260A32.bin Binary files differnew file mode 100644 index 000000000..69304c5cb --- /dev/null +++ b/data/trade/unk_8260A32.bin 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 diff --git a/data/trade/unk_826207C.png b/data/trade/unk_826207C.png Binary files differnew file mode 100644 index 000000000..01e26de43 --- /dev/null +++ b/data/trade/unk_826207C.png diff --git a/data/trade/unk_826407C.bin b/data/trade/unk_826407C.bin Binary files differnew file mode 100644 index 000000000..aad25ed83 --- /dev/null +++ b/data/trade/unk_826407C.bin diff --git a/data/trade/unk_826499C.pal b/data/trade/unk_826499C.pal new file mode 100644 index 000000000..64a442293 --- /dev/null +++ b/data/trade/unk_826499C.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/data/trade/unk_8264A1C.png b/data/trade/unk_8264A1C.png Binary files differnew file mode 100644 index 000000000..4197d701c --- /dev/null +++ b/data/trade/unk_8264A1C.png diff --git a/data/trade/unk_8264C1C.png b/data/trade/unk_8264C1C.png Binary files differnew file mode 100644 index 000000000..3dbbf845c --- /dev/null +++ b/data/trade/unk_8264C1C.png diff --git a/data/trade/unk_8264E1C.png b/data/trade/unk_8264E1C.png Binary files differnew file mode 100644 index 000000000..48b16f034 --- /dev/null +++ b/data/trade/unk_8264E1C.png diff --git a/data/trade/unk_826501C.png b/data/trade/unk_826501C.png Binary files differnew file mode 100644 index 000000000..a900dea3b --- /dev/null +++ b/data/trade/unk_826501C.png diff --git a/data/trade/unk_826601C.bin b/data/trade/unk_826601C.bin Binary files differnew file mode 100644 index 000000000..8846e2d7d --- /dev/null +++ b/data/trade/unk_826601C.bin diff --git a/data/trade/unk_826701C.png b/data/trade/unk_826701C.png Binary files differnew file mode 100644 index 000000000..91123d014 --- /dev/null +++ b/data/trade/unk_826701C.png diff --git a/data/trade/unk_826985C.bin b/data/trade/unk_826985C.bin Binary files differnew file mode 100644 index 000000000..19bab962b --- /dev/null +++ b/data/trade/unk_826985C.bin diff --git a/data/trade/unk_826995C.bin b/data/trade/unk_826995C.bin Binary files differnew file mode 100644 index 000000000..53a511321 --- /dev/null +++ b/data/trade/unk_826995C.bin diff --git a/data/trade/unk_8269A5C.bin b/data/trade/unk_8269A5C.bin Binary files differnew file mode 100644 index 000000000..52f6232fc --- /dev/null +++ b/data/trade/unk_8269A5C.bin diff --git a/data/trade/unk_826AA5C.bin b/data/trade/unk_826AA5C.bin Binary files differnew file mode 100644 index 000000000..80705aef5 --- /dev/null +++ b/data/trade/unk_826AA5C.bin diff --git a/data/trade/unk_826BB5C.pal b/data/trade/unk_826BB5C.pal new file mode 100644 index 000000000..a5da8a543 --- /dev/null +++ b/data/trade/unk_826BB5C.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +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 +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 new file mode 100644 index 000000000..218390aa2 --- /dev/null +++ b/data/trade/unk_826BD5C.pal @@ -0,0 +1,259 @@ +JASC-PAL +0100 +256 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +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 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +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 diff --git a/data/trade/unk_826BF5C.pal b/data/trade/unk_826BF5C.pal new file mode 100644 index 000000000..4b0812f09 --- /dev/null +++ b/data/trade/unk_826BF5C.pal @@ -0,0 +1,19 @@ +JASC-PAL +0100 +16 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 +0 0 0 diff --git a/data/trade/unk_826C60C.bin b/data/trade/unk_826C60C.bin Binary files differnew file mode 100644 index 000000000..4ce5d18b8 --- /dev/null +++ b/data/trade/unk_826C60C.bin 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); diff --git a/src/daycare.c b/src/daycare.c index ca9eb14f7..c016bbc38 100644 --- a/src/daycare.c +++ b/src/daycare.c @@ -76,7 +76,7 @@ extern const u8 gDaycareText_DontLikeOther[]; extern const u8 gDaycareText_PlayOther[]; extern const u8 gExpandedPlaceholder_Empty[]; -extern const u32 gUnknown_08331F60[]; // tilemap gameboy circle +extern const u32 gUnknown_826601C[]; // tilemap gameboy circle extern const u8 gText_HatchedFromEgg[]; extern const u8 gText_NickHatchPrompt[]; @@ -1880,7 +1880,7 @@ static void CB2_EggHatch_0(void) SetGpuReg(REG_OFFSET_DISPCNT, DISPCNT_OBJ_ON | DISPCNT_OBJ_1D_MAP); LoadPalette(gTradeGba2_Pal, 0x10, 0xA0); LoadBgTiles(1, gTradeGba_Gfx, 0x1420, 0); - CopyToBgTilemapBuffer(1, gUnknown_08331F60, 0x1000, 0); + CopyToBgTilemapBuffer(1, gUnknown_826601C, 0x1000, 0); CopyBgTilemapBufferToVram(1); gMain.state++; break; |
