From 0f541e703d5c074eff795bddea605b6966ee8f1d Mon Sep 17 00:00:00 2001 From: itskobold Date: Tue, 7 Nov 2017 19:46:00 +0000 Subject: [PATCH] shop.s, menu_indicators.s, naming_screen.s all only partially done --- data/menu_indicators.s | 27 ++++++--- data/naming_screen.s | 124 ++++++++++++++++++++++++++++++++--------- data/shop.s | 19 ++++++- 3 files changed, 133 insertions(+), 37 deletions(-) diff --git a/data/menu_indicators.s b/data/menu_indicators.s index ee97261cd3..debc2cbc83 100644 --- a/data/menu_indicators.s +++ b/data/menu_indicators.s @@ -10,28 +10,39 @@ gUnknown_08614244:: @ 8614244 .incbin "baserom.gba", 0x614244, 0x18 gUnknown_0861425C:: @ 861425C - .incbin "baserom.gba", 0x61425c, 0x4 +@ replacing .incbin "baserom.gba", 0x0061425c, 0x4 +.4byte 0x00000000 gUnknown_08614260:: @ 8614260 - .incbin "baserom.gba", 0x614260, 0x4 +@ replacing .incbin "baserom.gba", 0x00614260, 0x4 +.4byte 0x00100000 gUnknown_08614264:: @ 8614264 - .incbin "baserom.gba", 0x614264, 0x4 +@ replacing .incbin "baserom.gba", 0x00614264, 0x4 +.4byte 0x00200000 gUnknown_08614268:: @ 8614268 - .incbin "baserom.gba", 0x614268, 0x4 +@ replacing .incbin "baserom.gba", 0x00614268, 0x4 +.4byte 0x00300000 gUnknown_0861426C:: @ 861426C - .incbin "baserom.gba", 0x61426c, 0x4 +@ replacing .incbin "baserom.gba", 0x0061426c, 0x4 +.4byte 0x00400000 gUnknown_08614270:: @ 8614270 - .incbin "baserom.gba", 0x614270, 0x4 +@ replacing .incbin "baserom.gba", 0x00614270, 0x4 +.4byte 0x00500000 gUnknown_08614274:: @ 8614274 - .incbin "baserom.gba", 0x614274, 0x4 +@ replacing .incbin "baserom.gba", 0x00614274, 0x4 +.4byte 0x00600000 gUnknown_08614278:: @ 8614278 - .incbin "baserom.gba", 0x614278, 0x18 +@ replacing .incbin "baserom.gba", 0x00614278, 0x4 +.4byte 0x00700000 + +gUnknown_0861427C:: @ 861427C //found a pointer to this. added a new label + .incbin "baserom.gba", 0x61427C, 0x14 gUnknown_08614290:: @ 8614290 .incbin "baserom.gba", 0x614290, 0x18 diff --git a/data/naming_screen.s b/data/naming_screen.s index 80cbd0b097..cddf21c9f9 100644 --- a/data/naming_screen.s +++ b/data/naming_screen.s @@ -7,10 +7,16 @@ gUnknown_0858BD78:: @ 858BD78 .incbin "baserom.gba", 0x58bd78, 0x40 gUnknown_0858BDB8:: @ 858BDB8 - .incbin "baserom.gba", 0x58bdb8, 0x10 +@ replacing .incbin "baserom.gba", 0x0058bdb8, 0x10 +.4byte 0x8273216 +.4byte 0x8273256 +.4byte 0x8273296 +.4byte 0x82732d9 gUnknown_0858BDC8:: @ 858BDC8 - .incbin "baserom.gba", 0x58bdc8, 0x38 +@ replacing .incbin "baserom.gba", 0x0058bdc8, 0x38 +.byte 0xbb, 0xbc, 0xbd, 0xbe, 0xbf, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda +.byte 0xdb, 0xdc, 0xdd, 0xde, 0xdf, 0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xab, 0xff, 0x00, 0x00 gUnknown_0858BE00:: @ 858BE00 .incbin "baserom.gba", 0x58be00, 0x10 @@ -19,52 +25,83 @@ gUnknown_0858BE10:: @ 858BE10 .incbin "baserom.gba", 0x58be10, 0x30 gUnknown_0858BE40:: @ 858BE40 - .incbin "baserom.gba", 0x58be40, 0x60 +@ replacing .incbin "baserom.gba", 0x0058be40, 0x60 +.string "abcdef .ghijkl ,mnopqrs tuvwxyz ABCDEF .GHIJKL ,MNOPQRS TUVWXYZ 01234 56789 !?♂♀/- …“”‘’ " gUnknown_0858BEA0:: @ 858BEA0 - .incbin "baserom.gba", 0x58bea0, 0x3 +@ replacing .incbin "baserom.gba", 0x0058bea0, 0x3 +.byte 0x08, 0x08, 0x06 gUnknown_0858BEA3:: @ 858BEA3 - .incbin "baserom.gba", 0x58bea3, 0x18 +@ replacing .incbin "baserom.gba", 0x0058bea3, 0x18 +.byte 0x00, 0x0c, 0x18, 0x38, 0x44, 0x50, 0x5c, 0x7b, 0x00, 0x0c, 0x18, 0x38, 0x44, 0x50, 0x5c, 0x7b, 0x00, 0x16, 0x2c, 0x42, 0x58, 0x6e, 0x00, 0x00 gUnknown_0858BEBB:: @ 858BEBB - .incbin "baserom.gba", 0x58bebb, 0x3 +@ replacing .incbin "baserom.gba", 0x0058bebb, 0x3 +.byte 0x00, 0x02, 0x01 gUnknown_0858BEBE:: @ 858BEBE - .incbin "baserom.gba", 0x58bebe, 0x3 +@ replacing .incbin "baserom.gba", 0x0058bebe, 0x3 +.byte 0x01, 0x00, 0x02 gUnknown_0858BEC1:: @ 858BEC1 - .incbin "baserom.gba", 0x58bec1, 0x3 +@ replacing .incbin "baserom.gba", 0x0058bec1, 0x3 +.byte 0x02, 0x01, 0x00 gUnknown_0858BEC4:: @ 858BEC4 - .incbin "baserom.gba", 0x58bec4, 0x10 +@ replacing .incbin "baserom.gba", 0x0058bec4, 0x10 +.4byte sub_80E37B4 +.4byte sub_80E37DC +.4byte sub_80E3870 +.4byte sub_80E3904 gUnknown_0858BED4:: @ 858BED4 - .incbin "baserom.gba", 0x58bed4, 0x8 +@ replacing .incbin "baserom.gba", 0x0058bed4, 0x8 +.2byte 0x0000, 0xfffc, 0xfffe, 0xffff gUnknown_0858BEDC:: @ 858BEDC - .incbin "baserom.gba", 0x58bedc, 0x8 +@ replacing .incbin "baserom.gba", 0x0058bedc, 0x8 +.2byte 0x0002, 0x0003, 0x0002, 0x0001 gUnknown_0858BEE4:: @ 858BEE4 - .incbin "baserom.gba", 0x58bee4, 0x4 +@ replacing .incbin "baserom.gba", 0x0058bee4, 0x4 +.byte 0x01, 0x02, 0x03, 0x00 gUnknown_0858BEE8:: @ 858BEE8 - .incbin "baserom.gba", 0x58bee8, 0x10 +@ replacing .incbin "baserom.gba", 0x0058bee8, 0x10 +.4byte sub_80E40AC +.4byte sub_80E4100 +.4byte sub_80E4104 +.4byte sub_80E4178 gUnknown_0858BEF8:: @ 858BEF8 - .incbin "baserom.gba", 0x58bef8, 0x6 +@ replacing .incbin "baserom.gba", 0x0058bef8, 0x6 +.2byte 0x0001, 0x0003, 0x0002 gUnknown_0858BEFE:: @ 858BEFE - .incbin "baserom.gba", 0x58befe, 0x6 +@ replacing .incbin "baserom.gba", 0x0058befe, 0x6 +.2byte 0x0004, 0x0006, 0x0005 gUnknown_0858BF04:: @ 858BF04 - .incbin "baserom.gba", 0x58bf04, 0x14 +@ replacing .incbin "baserom.gba", 0x0058bf04, 0x14 +.4byte TaskDummy2 +.4byte sub_80E4384 +.4byte sub_80E43E0 +.4byte sub_80E4420 +.4byte sub_80E447C gUnknown_0858BF18:: @ 858BF18 - .incbin "baserom.gba", 0x58bf18, 0x10 +@ replacing .incbin "baserom.gba", 0x0058bf18, 0x10 +.4byte sub_80E450C +.4byte sub_80E4558 +.4byte sub_80E4580 +.4byte sub_80E45A4 gUnknown_0858BF28:: @ 858BF28 - .incbin "baserom.gba", 0x58bf28, 0xc +@ replacing .incbin "baserom.gba", 0x0058bf28, 0xc +.4byte sub_80E468C +.4byte sub_80E4692 +.4byte sub_80E46E8 gUnknown_0858BF34:: @ 858BF34 .incbin "baserom.gba", 0x58bf34, 0xa @@ -79,29 +116,51 @@ gUnknown_0858BF50:: @ 858BF50 .incbin "baserom.gba", 0x58bf50, 0x8 gUnknown_0858BF58:: @ 858BF58 - .incbin "baserom.gba", 0x58bf58, 0x14 +@ replacing .incbin "baserom.gba", 0x0058bf58, 0x14 +.4byte sub_80E4894 +.4byte sub_80E4894 +.4byte sub_80E48E8 +.4byte sub_80E48E8 +.4byte sub_80E4894 gUnknown_0858BF6C:: @ 858BF6C - .incbin "baserom.gba", 0x58bf6c, 0x8 +@ replacing .incbin "baserom.gba", 0x0058bf6c, 0x8 +.4byte TaskDummy3 +.4byte sub_80E49BC gUnknown_0858BF74:: @ 858BF74 .incbin "baserom.gba", 0x58bf74, 0x14 gUnknown_0858BF88:: @ 858BF88 - .incbin "baserom.gba", 0x58bf88, 0x4 +@ replacing .incbin "baserom.gba", 0x0058bf88, 0x4 +.byte 0xee, 0xdd, 0xff, 0x00 gUnknown_0858BF8C:: @ 858BF8C - .incbin "baserom.gba", 0x58bf8c, 0xc +@ replacing .incbin "baserom.gba", 0x0058bf8c, 0xc +.4byte 0x858bf80 +.4byte 0x858bf7c +.4byte 0x858bf84 gUnknown_0858BF98:: @ 858BF98 - .incbin "baserom.gba", 0x58bf98, 0xc +@ replacing .incbin "baserom.gba", 0x0058bf98, 0xc +.4byte 0x8dd4620 +.4byte 0x8dd46e0 +.4byte 0x8dd47a0 gUnknown_0858BFA4:: @ 858BFA4 .incbin "baserom.gba", 0x58bfa4, 0x34 gUnknown_0858BFD8:: @ 858BFD8 - .incbin "baserom.gba", 0x58bfd8, 0x78 - +@ replacing .incbin "baserom.gba", 0x0058bfd8, 0x14 +.4byte 0x858bfa8 +.4byte 0x858bfb4 +.4byte 0x858bfc0 +.4byte 0x858bfc0 +.4byte 0x858bfcc + +gUnknown_0858BFEC:: @ 858BFEC //found a pointer, added a new label + .incbin "baserom.gba", 0x58bfec, 0x64 + gUnknown_0858C050:: @ 858C050 .incbin "baserom.gba", 0x58c050, 0x8 @@ -142,10 +201,23 @@ gUnknown_0858C180:: @ 858C180 .incbin "baserom.gba", 0x58c180, 0x18 gUnknown_0858C198:: @ 858C198 - .incbin "baserom.gba", 0x58c198, 0x30 +@ replacing .incbin "baserom.gba", 0x0058c198, 0x30 +.4byte 0x862b88d +.4byte 0x862b8ae +.4byte 0x862b8cf +.4byte 0x862b8f0 +.4byte 0x862b911 +.4byte 0x862b932 +.4byte 0x862b953 +.4byte 0x862b974 +.4byte 0x862b995 +.4byte 0x862b9ae +.4byte 0x862b9c7 +.4byte 0x862b9e0 gUnknown_0858C1C8:: @ 858C1C8 .incbin "baserom.gba", 0x58c1c8, 0x68 gUnknown_0858C230:: @ 858C230 .incbin "baserom.gba", 0x58c230, 0x48 + diff --git a/data/shop.s b/data/shop.s index 8fd64c0bb7..caa69304ec 100644 --- a/data/shop.s +++ b/data/shop.s @@ -6,13 +6,25 @@ .section .rodata gUnknown_08589A08:: @ 8589A08 - .incbin "baserom.gba", 0x589a08, 0x8 +@ replacing .incbin "baserom.gba", 0x00589a08, 0x8 +.4byte BuyMenuTryMakePurchase +.4byte BuyMenuReturnToItemList gUnknown_08589A10:: @ 8589A10 - .incbin "baserom.gba", 0x589a10, 0x18 +@ replacing .incbin "baserom.gba", 0x00589a10, 0x18 +.4byte 0x85e93c7 +.4byte HandleShopMenuBuy +.4byte 0x85e93cb +.4byte HandleShopMenuSell +.4byte 0x85e93d0 +.4byte HandleShopMenuQuit gUnknown_08589A28:: @ 8589A28 - .incbin "baserom.gba", 0x589a28, 0x10 +@ replacing .incbin "baserom.gba", 0x00589a28, 0x10 +.4byte 0x85e93c7 +.4byte HandleShopMenuBuy +.4byte 0x85e93d0 +.4byte HandleShopMenuQuit gUnknown_08589A38:: @ 8589A38 .incbin "baserom.gba", 0x589a38, 0x10 @@ -55,3 +67,4 @@ gUnknown_08589AD8:: @ 8589AD8 gUnknown_08589ADE:: @ 8589ADE .incbin "baserom.gba", 0x589ade, 0x6 +