diff options
| -rw-r--r-- | data/link.s | 23 | ||||
| -rw-r--r-- | ld_script.txt | 1 | ||||
| -rw-r--r-- | src/link.c | 26 |
3 files changed, 25 insertions, 25 deletions
diff --git a/data/link.s b/data/link.s deleted file mode 100644 index b5ff999b8..000000000 --- a/data/link.s +++ /dev/null @@ -1,23 +0,0 @@ -@ the second big chunk of data - - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 - -gUnknown_082ED1FC:: @ 82ED1FC BgTemplate - .4byte 0x000001F8 - .4byte 0x00001081 - - .align 2 -gUnknown_082ED204:: @ 82ED204 - window_template 0x00, 0x00, 0x00, 0x1E, 0x05, 0x0F, 0x0002 - window_template 0x00, 0x00, 0x06, 0x1E, 0x07, 0x0F, 0x0098 - window_template 0x00, 0x00, 0x0D, 0x1E, 0x07, 0x0F, 0x016A - window_template_terminator - - .align 2 -gUnknown_082ED224:: @ 82ED224 - .byte 0x00, 0x01, 0x02, 0x00, 0xff, 0xfe, 0xff, 0x00 diff --git a/ld_script.txt b/ld_script.txt index 6308d5917..ee24d7903 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -331,7 +331,6 @@ SECTIONS { data/io_reg.o(.rodata); src/string_util.o(.rodata); src/link.o(.rodata); - data/link.o(.rodata); data/link_rfu.o(.rodata); data/rom_8011DC0.o(.rodata); src/rtc.o(.rodata); diff --git a/src/link.c b/src/link.c index 16208652e..d9d5a48dd 100644 --- a/src/link.c +++ b/src/link.c @@ -3,6 +3,8 @@ #include "global.h" #include "malloc.h" #include "save.h" +#include "bg.h" +#include "window.h" #include "librfu.h" #include "rng.h" #include "decompress.h" @@ -169,7 +171,29 @@ const u8 gUnknown_082ED1D0[] = { }; const char gASCIIGameFreakInc[] = "GameFreak inc."; const char gASCIITestPrint[] = "TEST PRINT\nP0\nP1\nP2\nP3"; - +const struct BgTemplate gUnknown_082ED1FC[] = { + { + .bg = 0, + .charBaseIndex = 2, + .mapBaseIndex = 31, + .priority = 0 + }, { + .bg = 1, + .charBaseIndex = 0, + .mapBaseIndex = 8, + .priority = 1 + } +}; +const struct WindowTemplate gUnknown_082ED204[] = { + {0x00, 0x00, 0x00, 0x1E, 0x05, 0x0F, 0x0002}, + {0x00, 0x00, 0x06, 0x1E, 0x07, 0x0F, 0x0098}, + {0x00, 0x00, 0x0D, 0x1E, 0x07, 0x0F, 0x016A}, + DUMMY_WIN_TEMPLATE +}; +const u8 gUnknown_082ED224[] = { + 0x00, 0x01, 0x02, 0x00, + 0xff, 0xfe, 0xff, 0x00 +}; // .text |