diff options
| author | Diegoisawesome <Diegoisawesome@users.noreply.github.com> | 2017-09-30 01:56:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-30 01:56:21 -0500 |
| commit | 88655144df3ff9a77a990bf0630d0db56e3d199c (patch) | |
| tree | 829d531c9540a1c2ec9e82b77b967bc6fa1a6cd5 /data | |
| parent | 7ffba45d0f0f0ae2d66320fcc182caee3abe0454 (diff) | |
| parent | e41b9cbbb37c908f77a9ce440f33b76b35139311 (diff) | |
Merge pull request #51 from DizzyEggg/decomp_money
decompile money
Diffstat (limited to 'data')
| -rw-r--r-- | data/graphics.s | 11 | ||||
| -rw-r--r-- | data/money.s | 13 | ||||
| -rw-r--r-- | data/naming_screen.s | 2 |
3 files changed, 8 insertions, 18 deletions
diff --git a/data/graphics.s b/data/graphics.s index 9c3034c91..0fa256449 100644 --- a/data/graphics.s +++ b/data/graphics.s @@ -604,14 +604,17 @@ gUnknown_08D9AE04:: @ 8D9AE04 gUnknown_08D9AF44:: @ 8D9AF44 .incbin "baserom.gba", 0xd9af44, 0x78 -gUnknown_08D9AFBC:: @ 8D9AFBC +gBuyMenuFrame_Gfx:: @ 8D9AFBC .incbin "baserom.gba", 0xd9afbc, 0x10c -gUnknown_08D9B0C8:: @ 8D9B0C8 +gMenuMoneyPal:: @ 8D9B0C8 .incbin "baserom.gba", 0xd9b0c8, 0x28 -gUnknown_08D9B0F0:: @ 8D9B0F0 - .incbin "baserom.gba", 0xd9b0f0, 0x1c4 +gBuyMenuFrame_Tilemap:: @ 8D9B0F0 + .incbin "baserom.gba", 0xd9b0f0, 0x140 + +gMenuMoneyGfx:: @ 8D9B230 + .incbin "baserom.gba", 0xd9b230, 0x84 gUnknown_08D9B2B4:: @ 8D9B2B4 .incbin "baserom.gba", 0xd9b2b4, 0x1bc diff --git a/data/money.s b/data/money.s deleted file mode 100644 index d7457be46..000000000 --- a/data/money.s +++ /dev/null @@ -1,13 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - -gUnknown_0858C28C:: @ 858C28C - .incbin "baserom.gba", 0x58c28c, 0x18 - -gUnknown_0858C2A4:: @ 858C2A4 - .incbin "baserom.gba", 0x58c2a4, 0x8 - -gUnknown_0858C2AC:: @ 858C2AC - .incbin "baserom.gba", 0x58c2ac, 0x8 diff --git a/data/naming_screen.s b/data/naming_screen.s index 352fac8e4..80cbd0b09 100644 --- a/data/naming_screen.s +++ b/data/naming_screen.s @@ -148,4 +148,4 @@ gUnknown_0858C1C8:: @ 858C1C8 .incbin "baserom.gba", 0x58c1c8, 0x68 gUnknown_0858C230:: @ 858C230 - .incbin "baserom.gba", 0x58c230, 0x5c + .incbin "baserom.gba", 0x58c230, 0x48 |