Decompile field region map bg and window templates

This commit is contained in:
PikalaxALT 2017-10-29 11:12:28 -04:00
parent 6e10e8caad
commit c0a229f108
4 changed files with 28 additions and 27 deletions

View File

@ -1,8 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.syntax unified
.text
.align 2, 0 @ Don't pad with nop.

View File

@ -1,14 +0,0 @@
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gUnknown_085E5068:: @ 85E5068 struct BgTemplate
.4byte 0x000001f0, 0x00002dca
.align 2
gUnknown_085E5070:: @ 85E5070
window_template 0x00, 0x11, 0x11, 0x0c, 0x02, 0x0f, 0x0001
window_template 0x00, 0x16, 0x01, 0x07, 0x02, 0x0f, 0x0019
window_template 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0000

View File

@ -213,7 +213,6 @@ SECTIONS {
asm/intro.o(.text);
src/reset_save_heap.o(.text);
src/field_region_map.o(.text);
asm/field_region_map.o(.text);
asm/battle_anim_8170478.o(.text);
asm/hall_of_fame.o(.text);
asm/credits.o(.text);
@ -435,7 +434,6 @@ SECTIONS {
data/player_pc.o(.rodata);
data/intro.o(.rodata);
src/field_region_map.o(.rodata);
data/field_region_map.o(.rodata);
data/battle_anim_8170478.o(.rodata);
data/hall_of_fame.o(.rodata);
data/credits.o(.rodata);

View File

@ -18,7 +18,7 @@
// Static RAM declarations
EWRAM_DATA struct {
static EWRAM_DATA struct {
MainCallback callback;
u32 filler_004;
struct RegionMap regionMap;
@ -35,8 +35,33 @@ static void sub_8170428(void);
// .rodata
extern const struct BgTemplate gUnknown_085E5068[];
extern const struct WindowTemplate gUnknown_085E5070[];
static const struct BgTemplate gUnknown_085E5068[] = {
{
.bg = 0,
.charBaseIndex = 0,
.mapBaseIndex = 31,
.screenSize = 0,
.paletteMode = 0,
.priority = 0,
.baseTile = 0
}, {
.bg = 2,
.charBaseIndex = 2,
.mapBaseIndex = 28,
.screenSize = 2,
.paletteMode = 1,
.priority = 2,
.baseTile = 0
}
};
static const struct WindowTemplate gUnknown_085E5070[] = {
{
0, 17, 17, 12, 2, 15, 0x0001
}, {
0, 22, 1, 7, 2, 15, 0x0019
}, DUMMY_WIN_TEMPLATE
};
// .text