summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPikalaxALT <PikalaxALT@gmail.com>2019-12-22 14:07:53 -0500
committerPikalaxALT <PikalaxALT@gmail.com>2019-12-22 14:07:53 -0500
commit337d755fc58165e12bf8ef5683eb994bc2d96719 (patch)
tree1602e2fb5449205ace7733896dc96b445dc0ead2
parentdac32d33660e6d994b794f3fa16850b63212eac9 (diff)
Structure gUnknown_8451EE4 template
-rw-r--r--data/pokedex_screen.s38
-rw-r--r--src/pokedex_screen.c6
2 files changed, 37 insertions, 7 deletions
diff --git a/data/pokedex_screen.s b/data/pokedex_screen.s
index f80eb0b3c..f6a4624af 100644
--- a/data/pokedex_screen.s
+++ b/data/pokedex_screen.s
@@ -2248,11 +2248,41 @@ gUnknown_8451ECC:: @ 8451ECC WindowTemplate
@ }
gUnknown_8451EE4:: @ 8451EE4 PokedexScreenData
- .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
- .byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
- .byte 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00
+ .align 2
+ .4byte 0x00000000
+ .4byte 0x00000000
+ .2byte 0x0001
+ .2byte 0x0000
+ .byte 0xff
+ .byte 0xff
+ .byte 0xff
+ .byte 0x00
+ .2byte 0xffff, 0xffff, 0xffff, 0xffff
+ .byte 0xff, 0xff, 0xff, 0xff
+ .byte 0xff, 0xff, 0xff, 0xff
+ .byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+ .4byte 0x00000000
+ .2byte 0x0000
+ .2byte 0x0000
+ .2byte 0x0000
+ .2byte 0x0000
+ .2byte 0x0000
+ .2byte 0x0000
+ .byte 0xff, 0x00, 0x00
+ .align 2
+ .4byte NULL
+ .2byte 0x0000
+ .byte 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff
+ .2byte 0x0000
+ .4byte NULL
+ .byte 0xff, 0xff
+ .2byte 0x0000
+ .byte 0x00
+ .align 1
+ .2byte 0x0000, 0x0000, 0x0000, 0x0000
+ .align 2
gUnknown_8451F54:: @ 8451F54 WindowTemplate
.byte 1, 1, 2, 20, 16, 0
.2byte 0x0008
diff --git a/src/pokedex_screen.c b/src/pokedex_screen.c
index ea6df71be..b83049a28 100644
--- a/src/pokedex_screen.c
+++ b/src/pokedex_screen.c
@@ -32,7 +32,7 @@ struct PokedexScreenData
u8 field_01;
u8 field_02;
u8 field_03;
- u8 filler_04[0x4];
+ u8 field_04;
u32 field_08;
u32 field_0C;
u16 field_10;
@@ -64,13 +64,13 @@ struct PokedexScreenData
u8 field_42;
struct ListMenuItem * field_44;
u16 field_48;
- u8 filler_4A[0x10];
+ u8 field_4A[0x10];
u16 field_5A;
u16 * field_5C;
u8 field_60;
u8 field_61;
u16 field_62;
- u8 filler_64[0x2];
+ u8 field_64;
u16 field_66;
u16 field_68;
u16 field_6A;