diff --git a/data/data_08108050.s b/data/data_08108050.s deleted file mode 100644 index a9c5a932..00000000 --- a/data/data_08108050.s +++ /dev/null @@ -1,32 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - .align 2 - -gUnk_08108050:: @ 08108050 - .incbin "baserom.gba", 0x108050, 0x000001E - -gUnk_0810806E:: @ 0810806E - .incbin "baserom.gba", 0x10806E, 0x0000036 - -gUnk_081080A4:: @ 081080A4 - .incbin "baserom.gba", 0x1080A4, 0x0000020 - -gUnk_081080C4:: @ 081080C4 - .incbin "baserom.gba", 0x1080C4, 0x0000043 - -gUnk_08108107:: @ 08108107 - .incbin "baserom.gba", 0x108107, 0x0000079 - -gUnk_08108180:: @ 08108180 - .incbin "baserom.gba", 0x108180, 0x0000064 - -gUnk_081081E4:: @ 081081E4 - .incbin "baserom.gba", 0x1081E4, 0x0000008 - -gUnk_081081EC:: @ 081081EC - .incbin "baserom.gba", 0x1081EC, 0x0000008 - -gUnk_081081F4:: @ 081081F4 - .incbin "baserom.gba", 0x1081F4, 0x0000014 diff --git a/data/data_081081EC.s b/data/data_081081EC.s new file mode 100644 index 00000000..4d0e1d08 --- /dev/null +++ b/data/data_081081EC.s @@ -0,0 +1,11 @@ + .include "asm/macros.inc" + .include "constants/constants.inc" + + .section .rodata + .align 2 + +gUnk_081081EC:: @ 081081EC + .incbin "baserom.gba", 0x1081EC, 0x0000008 + +gUnk_081081F4:: @ 081081F4 + .incbin "baserom.gba", 0x1081F4, 0x0000014 diff --git a/linker.ld b/linker.ld index b7e060a8..d58589a4 100644 --- a/linker.ld +++ b/linker.ld @@ -984,7 +984,8 @@ SECTIONS { data/map_headers.o(.rodata); data/data_08107BC8.o(.rodata); src/manager/manager5.o(.rodata); - data/data_08108050.o(.rodata); + src/manager/manager7.o(.rodata); + data/data_081081EC.o(.rodata); src/manager/managerB.o(.rodata); data/data_0810821C.o(.rodata); src/item.o(.rodata); diff --git a/src/manager/manager7.c b/src/manager/manager7.c index f9c60fdc..14557946 100644 --- a/src/manager/manager7.c +++ b/src/manager/manager7.c @@ -20,11 +20,72 @@ extern u32 sub_08056300(const u16*); extern void sub_0805E3A0(); extern u8 gUnk_02034490; -extern const u8 gUnk_081081E4[]; extern const u8 gGlobalGfxAndPalettes[]; -extern const u16 gUnk_08108050[0xF]; -extern const u32 gUnk_081080A4[0x50]; +const u16 gUnk_08108050[0x2A] = { + 0, 0, 0x20, 0xE0, + 0xE0, 1, 0, 0x1D0, + 0x80, 0x60, 2, 0x170, + 0x278, 0xF8, 0xA0, 3, + 0x310, 0x178, 0xC0, 0x150, + 3, 0x340, 0x2C8, 0x60, + 0x90, 4, 0x1D0, 0, + 0x200, 0xE0, 1, 0x108, + 0x188, 0xD0, 0x80, 2, + 0x1E8, 0x338, 0x50, 0xC0, + 0xFF, 0 +}; + +const u32 gUnk_081080A4[0x50] = { + 0x001095E0, 0x06000000, + 0x0010A5E0, 0x06001000, + 0x0010B5E0, 0x06002000, + 0x0010C5E0, 0x06003000, + 0x0010D5E0, 0x06008000, + 0x0010E5E0, 0x06009000, + 0x0010F5E0, 0x0600A000, + 0x001105E0, 0x0600B000, + 0x001115E0, 0x06000000, + 0x001125E0, 0x06001000, + 0x001135E0, 0x06002000, + 0x001145E0, 0x06003000, + 0x001155E0, 0x06008000, + 0x001165E0, 0x06009000, + 0x001175E0, 0x0600A000, + 0x001185E0, 0x0600B000, + 0x001195E0, 0x06000000, + 0x0011A5E0, 0x06001000, + 0x0011B5E0, 0x06002000, + 0x0011C5E0, 0x06003000, + 0x0011D5E0, 0x06008000, + 0x0011E5E0, 0x06009000, + 0x0011F5E0, 0x0600A000, + 0x001205E0, 0x0600B000, + 0x001215E0, 0x06000000, + 0x001225E0, 0x06001000, + 0x001235E0, 0x06002000, + 0x001245E0, 0x06003000, + 0x001255E0, 0x06008000, + 0x001265E0, 0x06009000, + 0x001275E0, 0x0600A000, + 0x001285E0, 0x0600B000, + 0x001295E0, 0x06000000, + 0x0012A5E0, 0x06001000, + 0x0012B5E0, 0x06002000, + 0x0012C5E0, 0x06003000, + 0x0012D5E0, 0x06008000, + 0x0012E5E0, 0x06009000, + 0x0012F5E0, 0x0600A000, + 0x001305E0, 0x0600B000 +}; + +const u8 gUnk_081081E4[] = { + 0x16, + 0x17, + 0x17, + 0x18, + 0x18 +}; void Manager7_Main(Manager7* this) { u32 tmp;