From 63460df7fd758f9178657879e2d210016e75ac43 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Tue, 16 Jan 2018 00:40:42 -0500 Subject: [PATCH 1/3] dump shop.s --- data/shop.s | 85 ++++++++++++++++++++++++++++++++++++++++++++--------- 1 file changed, 71 insertions(+), 14 deletions(-) diff --git a/data/shop.s b/data/shop.s index 304ea12f7d..2b34d28522 100644 --- a/data/shop.s +++ b/data/shop.s @@ -24,43 +24,100 @@ gUnknown_08589A28:: @ 8589A28 .4byte HandleShopMenuQuit gUnknown_08589A38:: @ 8589A38 - .incbin "baserom.gba", 0x589a38, 0x10 + .byte 0, 2, 1, 9, 6, 15, 8, 0, 0, 2, 1, 9, 4, 15, 8, 0 gUnknown_08589A48:: @ 8589A48 - .incbin "baserom.gba", 0x589a48, 0x18 + .byte 0, 0, 0, 0, 0x3D, 0, 14, 8, 21, 1, 14, 8, 0, 0, 0, 0, 1, 0, 8, 0, 33, 48, 0, 7 gUnknown_08589A60:: @ 8589A60 - .incbin "baserom.gba", 0x589a60, 0x10 + .4byte 0x1F8 + .4byte 0x11E1 + .4byte 0x21D2 + .4byte 0x31C3 gUnknown_08589A70:: @ 8589A70 - .incbin "baserom.gba", 0x589a70, 0x38 + .byte 0 + .byte 1 + .byte 1 + .byte 10 + .byte 2 + .byte 15 + .2byte 30 + .byte 0 + .byte 14 + .byte 2 + .byte 15 + .byte 16 + .byte 15 + .2byte 50 + .byte 0 + .byte 0 + .byte 13 + .byte 14 + .byte 6 + .byte 15 + .2byte 0x122 + .byte 0 + .byte 1 + .byte 11 + .byte 12 + .byte 2 + .byte 15 + .2byte 0x176 + .byte 0 + .byte 18 + .byte 11 + .byte 10 + .byte 2 + .byte 15 + .2byte 0x18E + .byte 0 + .byte 2 + .byte 15 + .byte 27 + .byte 4 + .byte 15 + .2byte 0x1A2 + .byte 0xFF + .byte 0 + .byte 0 + .byte 0 + .byte 0 + .byte 0 + .2byte 0 gUnknown_08589AA8:: @ 8589AA8 - .incbin "baserom.gba", 0x589aa8, 0x8 + .byte 0 + .byte 21 + .byte 9 + .byte 5 + .byte 4 + .byte 15 + .2byte 0x20E gUnknown_08589AB0:: @ 8589AB0 - .incbin "baserom.gba", 0x589ab0, 0x3 + .byte 1, 2, 3 gUnknown_08589AB3:: @ 8589AB3 - .incbin "baserom.gba", 0x589ab3, 0x7 + .byte 0, 2, 3, 0, 3, 2, 0 gUnknown_08589ABA:: @ 8589ABA - .incbin "baserom.gba", 0x589aba, 0x6 + .2byte 0x284, 0x282, 0x280 gUnknown_08589AC0:: @ 8589AC0 - .incbin "baserom.gba", 0x589ac0, 0x6 + .2byte 0x285, 0x283, 0x281 gUnknown_08589AC6:: @ 8589AC6 - .incbin "baserom.gba", 0x589ac6, 0x6 + .2byte 0x28C, 0x28A, 0x288 gUnknown_08589ACC:: @ 8589ACC - .incbin "baserom.gba", 0x589acc, 0x6 + .2byte 0x28D, 0x28B, 0x289 gUnknown_08589AD2:: @ 8589AD2 - .incbin "baserom.gba", 0x589ad2, 0x6 + .2byte 0x2A0, 0x2A2, 0x2A4 gUnknown_08589AD8:: @ 8589AD8 - .incbin "baserom.gba", 0x589ad8, 0x6 + .2byte 0x2A1, 0x2A3, 0x2A5 gUnknown_08589ADE:: @ 8589ADE - .incbin "baserom.gba", 0x589ade, 0x6 + .2byte 0x2A8, 0x2AA, 0x2AC From f9d7b6a9236418677dadc0a8895d17695115d9e6 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Tue, 16 Jan 2018 00:56:12 -0500 Subject: [PATCH 2/3] fixes --- data/shop.s | 72 +++++++++++------------------------------------------ 1 file changed, 14 insertions(+), 58 deletions(-) diff --git a/data/shop.s b/data/shop.s index 2b34d28522..62af8f1068 100644 --- a/data/shop.s +++ b/data/shop.s @@ -24,10 +24,14 @@ gUnknown_08589A28:: @ 8589A28 .4byte HandleShopMenuQuit gUnknown_08589A38:: @ 8589A38 - .byte 0, 2, 1, 9, 6, 15, 8, 0, 0, 2, 1, 9, 4, 15, 8, 0 + window_template 0, 2, 1, 9, 6, 15, 8 + window_template 0, 2, 1, 9, 4, 15, 8 gUnknown_08589A48:: @ 8589A48 - .byte 0, 0, 0, 0, 0x3D, 0, 14, 8, 21, 1, 14, 8, 0, 0, 0, 0, 1, 0, 8, 0, 33, 48, 0, 7 + .byte 0, 0, 0, 0 + .4byte BuyMenuPrintItemDescriptionAndShowItemIcon + .4byte BuyMenuPrintPriceInList + .byte 0, 0, 0, 0, 1, 0, 8, 0, 33, 48, 0, 7 gUnknown_08589A60:: @ 8589A60 .4byte 0x1F8 @@ -36,64 +40,16 @@ gUnknown_08589A60:: @ 8589A60 .4byte 0x31C3 gUnknown_08589A70:: @ 8589A70 - .byte 0 - .byte 1 - .byte 1 - .byte 10 - .byte 2 - .byte 15 - .2byte 30 - .byte 0 - .byte 14 - .byte 2 - .byte 15 - .byte 16 - .byte 15 - .2byte 50 - .byte 0 - .byte 0 - .byte 13 - .byte 14 - .byte 6 - .byte 15 - .2byte 0x122 - .byte 0 - .byte 1 - .byte 11 - .byte 12 - .byte 2 - .byte 15 - .2byte 0x176 - .byte 0 - .byte 18 - .byte 11 - .byte 10 - .byte 2 - .byte 15 - .2byte 0x18E - .byte 0 - .byte 2 - .byte 15 - .byte 27 - .byte 4 - .byte 15 - .2byte 0x1A2 - .byte 0xFF - .byte 0 - .byte 0 - .byte 0 - .byte 0 - .byte 0 - .2byte 0 + window_template 0, 1, 1, 10, 2, 15, 30 + window_template 0, 14, 2, 15, 16, 15, 50 + window_template 0, 0, 13, 14, 6, 15, 0x122 + window_template 0, 1, 11, 12, 2, 15, 0x176 + window_template 0, 18, 11, 10, 2, 15, 0x18E + window_template 0, 2, 15, 27, 4, 15, 0x1A2 + window_template_terminator gUnknown_08589AA8:: @ 8589AA8 - .byte 0 - .byte 21 - .byte 9 - .byte 5 - .byte 4 - .byte 15 - .2byte 0x20E + window_template 0, 21, 9, 5, 4, 15, 0x20E gUnknown_08589AB0:: @ 8589AB0 .byte 1, 2, 3 From 29d84dabe61051238c7b7e6dd805fc2de447ba72 Mon Sep 17 00:00:00 2001 From: golem galvanize Date: Tue, 16 Jan 2018 01:01:14 -0500 Subject: [PATCH 3/3] spacing fix --- data/shop.s | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/data/shop.s b/data/shop.s index 62af8f1068..d19feff1ec 100644 --- a/data/shop.s +++ b/data/shop.s @@ -25,31 +25,31 @@ gUnknown_08589A28:: @ 8589A28 gUnknown_08589A38:: @ 8589A38 window_template 0, 2, 1, 9, 6, 15, 8 - window_template 0, 2, 1, 9, 4, 15, 8 + window_template 0, 2, 1, 9, 4, 15, 8 gUnknown_08589A48:: @ 8589A48 .byte 0, 0, 0, 0 - .4byte BuyMenuPrintItemDescriptionAndShowItemIcon - .4byte BuyMenuPrintPriceInList - .byte 0, 0, 0, 0, 1, 0, 8, 0, 33, 48, 0, 7 + .4byte BuyMenuPrintItemDescriptionAndShowItemIcon + .4byte BuyMenuPrintPriceInList + .byte 0, 0, 0, 0, 1, 0, 8, 0, 33, 48, 0, 7 gUnknown_08589A60:: @ 8589A60 .4byte 0x1F8 - .4byte 0x11E1 - .4byte 0x21D2 - .4byte 0x31C3 + .4byte 0x11E1 + .4byte 0x21D2 + .4byte 0x31C3 gUnknown_08589A70:: @ 8589A70 window_template 0, 1, 1, 10, 2, 15, 30 - window_template 0, 14, 2, 15, 16, 15, 50 - window_template 0, 0, 13, 14, 6, 15, 0x122 - window_template 0, 1, 11, 12, 2, 15, 0x176 - window_template 0, 18, 11, 10, 2, 15, 0x18E - window_template 0, 2, 15, 27, 4, 15, 0x1A2 - window_template_terminator + window_template 0, 14, 2, 15, 16, 15, 50 + window_template 0, 0, 13, 14, 6, 15, 0x122 + window_template 0, 1, 11, 12, 2, 15, 0x176 + window_template 0, 18, 11, 10, 2, 15, 0x18E + window_template 0, 2, 15, 27, 4, 15, 0x1A2 + window_template_terminator gUnknown_08589AA8:: @ 8589AA8 - window_template 0, 21, 9, 5, 4, 15, 0x20E + window_template 0, 21, 9, 5, 4, 15, 0x20E gUnknown_08589AB0:: @ 8589AB0 .byte 1, 2, 3