summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2020-07-04 20:32:44 -0400
committerluckytyphlosion <10688458+luckytyphlosion@users.noreply.github.com>2020-07-04 20:32:44 -0400
commit1ad6f5270c38e6010bb64b3b7813b097e531f5df (patch)
tree1d405b3ac555b11c9f2a15456100db0d6fbfde1b
parentd7df6bf6e3b6066bef0bd0602b0b9c2d036f100a (diff)
Port over PSS data to src.
-rw-r--r--data/pokemon_summary_screen.s442
-rw-r--r--include/strings.h11
-rw-r--r--ld_script.txt2
-rw-r--r--src/data/text/nature_names.h54
-rw-r--r--src/pokemon_summary_screen.c646
5 files changed, 662 insertions, 493 deletions
diff --git a/data/pokemon_summary_screen.s b/data/pokemon_summary_screen.s
deleted file mode 100644
index 2c221fb21..000000000
--- a/data/pokemon_summary_screen.s
+++ /dev/null
@@ -1,442 +0,0 @@
- .include "asm/macros.inc"
- .include "constants/constants.inc"
- .section .rodata
- .align 2
-
-gUnknown_84636C0:: @ 84636C0
- .incbin "graphics/interface/pokesummary_unk_84636C0.gbapal"
-
-gUnknown_84636E0:: @ 84636E0
- .incbin "graphics/interface/pokesummary_unk_84636E0.gbapal"
-
-gUnknown_8463700:: @ 8463700
- .incbin "graphics/interface/pokesummary_unk_8463700.gbapal"
-
-gUnknown_8463720:: @ 8463720
- .incbin "graphics/interface/pokesummary_unk_8463720.gbapal"
-
-gUnknown_8463740:: @ 8463740
- .incbin "graphics/interface/pokesummary_unk_8463740.4bpp.lz"
-
-gUnknown_846386C:: @ 846386C
- .incbin "graphics/interface/pokesummary_unk_846386C.4bpp.lz"
-
-gUnknown_846398C:: @ 846398C
- .4byte 0xc0004000, 0x00000000
-
-gUnknown_8463994:: @ 8463994
- obj_image_anim_frame 0x0000, 20
- obj_image_anim_jump 0
-
-gUnknown_846399C:: @ 846399C
- obj_image_anim_frame 0x0020, 20
- obj_image_anim_jump 0
-
-gUnknown_84639A4:: @ 84639A4
- .4byte gUnknown_8463994
- .4byte gUnknown_846399C
-
-gUnknown_84639AC:: @ 84639AC
- .4byte 0x40004000, 0x00000000
-
-gUnknown_84639B4:: @ 84639B4
- obj_image_anim_frame 0x0000, 20
- obj_image_anim_jump 0
-
-gUnknown_84639BC:: @ 84639BC
- obj_image_anim_frame 0x0004, 20
- obj_image_anim_jump 0
-
-gUnknown_84639C4:: @ 84639C4
- obj_image_anim_frame 0x0008, 20
- obj_image_anim_jump 0
-
-gUnknown_84639CC:: @ 84639CC
- obj_image_anim_frame 0x000c, 20
- obj_image_anim_jump 0
-
-gUnknown_84639D4:: @ 84639D4
- obj_image_anim_frame 0x0010, 20
- obj_image_anim_jump 0
-
-gUnknown_84639DC:: @ 84639DC
- obj_image_anim_frame 0x0014, 20
- obj_image_anim_jump 0
-
-gUnknown_84639E4:: @ 84639E4
- obj_image_anim_frame 0x0018, 20
- obj_image_anim_jump 0
-
-gUnknown_84639EC:: @ 84639EC
- obj_image_anim_frame 0x001c, 20
- obj_image_anim_jump 0
-
-gUnknown_84639F4:: @ 84639F4
- .4byte gUnknown_84639B4
- .4byte gUnknown_84639BC
- .4byte gUnknown_84639C4
- .4byte gUnknown_84639CC
- .4byte gUnknown_84639D4
- .4byte gUnknown_84639DC
- .4byte gUnknown_84639E4
- .4byte gUnknown_84639EC
-
-gUnknown_8463A14:: @ 8463A14
- .4byte 0x00000000, 0x00000000
-
-gUnknown_8463A1C:: @ 8463A1C
- obj_image_anim_frame 0x0000, 20
- obj_image_anim_jump 0
-
-gUnknown_8463A24:: @ 8463A24
- obj_image_anim_frame 0x0001, 20
- obj_image_anim_jump 0
-
-gUnknown_8463A2C:: @ 8463A2C
- obj_image_anim_frame 0x0002, 20
- obj_image_anim_jump 0
-
-gUnknown_8463A34:: @ 8463A34
- obj_image_anim_frame 0x0003, 20
- obj_image_anim_jump 0
-
-gUnknown_8463A3C:: @ 8463A3C
- obj_image_anim_frame 0x0004, 20
- obj_image_anim_jump 0
-
-gUnknown_8463A44:: @ 8463A44
- obj_image_anim_frame 0x0005, 20
- obj_image_anim_jump 0
-
-gUnknown_8463A4C:: @ 8463A4C
- obj_image_anim_frame 0x0006, 20
- obj_image_anim_jump 0
-
-gUnknown_8463A54:: @ 8463A54
- obj_image_anim_frame 0x0007, 20
- obj_image_anim_jump 0
-
-gUnknown_8463A5C:: @ 8463A5C
- obj_image_anim_frame 0x0008, 20
- obj_image_anim_jump 0
-
-gUnknown_8463A64:: @ 8463A64
- obj_image_anim_frame 0x0009, 20
- obj_image_anim_jump 0
-
-gUnknown_8463A6C:: @ 8463A6C
- obj_image_anim_frame 0x000a, 20
- obj_image_anim_jump 0
-
-gUnknown_8463A74:: @ 8463A74
- obj_image_anim_frame 0x000b, 20
- obj_image_anim_jump 0
-
-gUnknown_8463A7C:: @ 8463A7C
- .4byte gUnknown_8463A1C
- .4byte gUnknown_8463A24
- .4byte gUnknown_8463A2C
- .4byte gUnknown_8463A34
- .4byte gUnknown_8463A3C
- .4byte gUnknown_8463A44
- .4byte gUnknown_8463A4C
- .4byte gUnknown_8463A54
- .4byte gUnknown_8463A5C
- .4byte gUnknown_8463A64
- .4byte gUnknown_8463A6C
- .4byte gUnknown_8463A74
-
-gUnknown_8463AAC:: @ 8463AAC
- .incbin "graphics/interface/pokesummary_unk_8463AAC.gbapal"
-
-gUnknown_8463ACC:: @ 8463ACC
- .incbin "graphics/interface/pokesummary_unk_8463ACC.gbapal"
-
-gUnknown_8463AEC:: @ 8463AEC
- .4byte 0x00000000, 0x00000000
-
-gUnknown_8463AF4:: @ 8463AF4
- obj_image_anim_frame 0x0000, 20
- obj_image_anim_jump 0
-
-gUnknown_8463AFC:: @ 8463AFC
- .4byte gUnknown_8463AF4
-
-gUnknown_8463B00:: @ 8463B00
- .incbin "graphics/interface/pokesummary_unk_8463B00.gbapal"
-
-gUnknown_8463B20:: @ 8463B20
- .incbin "graphics/interface/pokesummary_unk_8463B20.4bpp.lz"
-
-gUnknown_8463B30:: @ 8463B30
- .4byte 0x00000000, 0x00000000
-
-gUnknown_8463B38:: @ 8463B38
- obj_image_anim_frame 0x0001, 20
- obj_image_anim_jump 0
-
-gUnknown_8463B40:: @ 8463B40
- .4byte gUnknown_8463B38
-
-gUnknown_8463B44:: @ 8463B44
- .incbin "graphics/interface/pokesummary_unk_8463B44.gbapal"
-
-gUnknown_8463B64:: @ 8463B64
- .incbin "graphics/interface/pokesummary_unk_8463B64.4bpp.lz"
-
-gUnknown_8463B88:: @ 8463B88
- .incbin "graphics/interface/pokesummary_unk_8463B88.bin.lz"
-
-gUnknown_8463C80:: @ 8463C80
- .incbin "graphics/interface/pokesummary_unk_8463C80.bin.lz"
-
-gUnknown_8463DBC:: @ 8463DBC
- .string "HARDY$"
-
-gUnknown_8463DC2:: @ 8463DC2
- .string "LONELY$"
-
-gUnknown_8463DC9:: @ 8463DC9
- .string "BRAVE$"
-
-gUnknown_8463DCF:: @ 8463DCF
- .string "ADAMANT$"
-
-gUnknown_8463DD7:: @ 8463DD7
- .string "NAUGHTY$"
-
-gUnknown_8463DDF:: @ 8463DDF
- .string "BOLD$"
-
-gUnknown_8463DE4:: @ 8463DE4
- .string "DOCILE$"
-
-gUnknown_8463DEB:: @ 8463DEB
- .string "RELAXED$"
-
-gUnknown_8463DF3:: @ 8463DF3
- .string "IMPISH$"
-
-gUnknown_8463DFA:: @ 8463DFA
- .string "LAX$"
-
-gUnknown_8463DFE:: @ 8463DFE
- .string "TIMID$"
-
-gUnknown_8463E04:: @ 8463E04
- .string "HASTY$"
-
-gUnknown_8463E0A:: @ 8463E0A
- .string "SERIOUS$"
-
-gUnknown_8463E12:: @ 8463E12
- .string "JOLLY$"
-
-gUnknown_8463E18:: @ 8463E18
- .string "NAIVE$"
-
-gUnknown_8463E1E:: @ 8463E1E
- .string "MODEST$"
-
-gUnknown_8463E25:: @ 8463E25
- .string "MILD$"
-
-gUnknown_8463E2A:: @ 8463E2A
- .string "QUIET$"
-
-gUnknown_8463E30:: @ 8463E30
- .string "BASHFUL$"
-
-gUnknown_8463E38:: @ 8463E38
- .string "RASH$"
-
-gUnknown_8463E3D:: @ 8463E3D
- .string "CALM$"
-
-gUnknown_8463E42:: @ 8463E42
- .string "GENTLE$"
-
-gUnknown_8463E49:: @ 8463E49
- .string "SASSY$"
-
-gUnknown_8463E4F:: @ 8463E4F
- .string "CAREFUL$"
-
-gUnknown_8463E57:: @ 8463E57
- .string "QUIRKY$"
-
- .align 2
-gNatureNamePointers:: @ 8463E60 dataptr
- .4byte gUnknown_8463DBC
- .4byte gUnknown_8463DC2
- .4byte gUnknown_8463DC9
- .4byte gUnknown_8463DCF
- .4byte gUnknown_8463DD7
- .4byte gUnknown_8463DDF
- .4byte gUnknown_8463DE4
- .4byte gUnknown_8463DEB
- .4byte gUnknown_8463DF3
- .4byte gUnknown_8463DFA
- .4byte gUnknown_8463DFE
- .4byte gUnknown_8463E04
- .4byte gUnknown_8463E0A
- .4byte gUnknown_8463E12
- .4byte gUnknown_8463E18
- .4byte gUnknown_8463E1E
- .4byte gUnknown_8463E25
- .4byte gUnknown_8463E2A
- .4byte gUnknown_8463E30
- .4byte gUnknown_8463E38
- .4byte gUnknown_8463E3D
- .4byte gUnknown_8463E42
- .4byte gUnknown_8463E49
- .4byte gUnknown_8463E4F
- .4byte gUnknown_8463E57
-
-gUnknown_8463EC4:: @ 8463EC4
- .4byte gUnknown_8419B44
- .4byte gUnknown_8419B7B
- .4byte gUnknown_8419BAE
- .4byte gUnknown_8419BDB
-
-gUnknown_8463ED4:: @ 8463ED4
- .4byte gUnknown_8419A3D
- .4byte gUnknown_8419B18
- .4byte gUnknown_8419A6E
- .4byte gUnknown_8419B18
- .4byte gUnknown_8419AA2
- .4byte gUnknown_8419ADE
- .4byte gUnknown_8419B18
-
-gUnknown_8463EF0:: @ 8463EF0
- .byte 0x00, 0x07, 0x08, 0x00, 0x01, 0x02, 0x00, 0x03, 0x04, 0x00, 0x05, 0x06
-
-gUnknown_8463EFC:: @ 8463EFC
- .4byte 0x000002e0
- @ {
- @ .bg = 0,
- @ .charBaseIndex = 0,
- @ .mapBaseIndex = 14,
- @ .screenSize = 1,
- @ .paletteMode = 0,
- @ .priority = 0,
- @ .baseTile = 0x0000
- @ }
- .4byte 0x000012aa
- @ {
- @ .bg = 2,
- @ .charBaseIndex = 2,
- @ .mapBaseIndex = 10,
- @ .screenSize = 1,
- @ .paletteMode = 0,
- @ .priority = 1,
- @ .baseTile = 0x0000
- @ }
- .4byte 0x0000309b
- @ {
- @ .bg = 3,
- @ .charBaseIndex = 2,
- @ .mapBaseIndex = 9,
- @ .screenSize = 0,
- @ .paletteMode = 0,
- @ .priority = 3,
- @ .baseTile = 0x0000
- @ }
- .4byte 0x000022c9
- @ {
- @ .bg = 1,
- @ .charBaseIndex = 2,
- @ .mapBaseIndex = 12,
- @ .screenSize = 1,
- @ .paletteMode = 0,
- @ .priority = 2,
- @ .baseTile = 0x0000
- @ }
-
-gUnknown_8463F0C:: @ 8463F0C
- .byte 1, 0, 0, 13, 2, 7
- .2byte 0x0258
- .byte 1, 19, 0, 11, 2, 7
- .2byte 0x0272
- .byte 1, 0, 2, 15, 2, 7
- .2byte 0x0288
-
-gUnknown_8463F24:: @ 8463F24
- .byte 2, 0, 0, 13, 2, 7
- .2byte 0x0258
- .byte 2, 19, 0, 11, 2, 7
- .2byte 0x0272
- .byte 2, 0, 2, 15, 2, 7
- .2byte 0x0288
-
-gUnknown_8463F3C:: @ 8463F3C
- .byte 0, 15, 2, 15, 12, 6
- .2byte 0x0001
- .byte 0, 1, 14, 28, 6, 6
- .2byte 0x00b5
- .byte 0, 0, 0, 0, 0, 0
- .2byte 0x0000
- .byte 0, 0, 0, 0, 0, 0
- .2byte 0x0000
-
-gUnknown_8463F5C:: @ 8463F5C
- .byte 0, 20, 2, 10, 14, 6
- .2byte 0x0001
- .byte 0, 6, 12, 14, 4, 6
- .2byte 0x008d
- .byte 0, 1, 16, 29, 4, 6
- .2byte 0x00c5
- .byte 0, 0, 0, 0, 0, 0
- .2byte 0x0000
-
-gUnknown_8463F7C:: @ 8463F7C
- .byte 0, 20, 2, 10, 18, 8
- .2byte 0x0001
- .byte 0, 0, 7, 15, 13, 6
- .2byte 0x00b5
- .byte 0, 15, 2, 5, 18, 6
- .2byte 0x0178
- .byte 0, 6, 4, 9, 2, 6
- .2byte 0x01d2
-
-gUnknown_8463F9C:: @ 8463F9C
- .byte 255, 0, 0, 0, 0, 0
- .2byte 0x0000
-
-gUnknown_8463FA4:: @ 8463FA4
- .byte 0x00, 0x0e, 0x0a
- .byte 0x00, 0x01, 0x02
- .byte 0x00, 0x09, 0x08
- .byte 0x00, 0x05, 0x04
- .byte 0x00, 0x02, 0x03
- .byte 0x00, 0x0b, 0x0a
-
- .balign 4, 0
-gUnknown_8463FB8:: @ 8463FB8
- .byte 0x00, 0x02, 0x03, 0x01, 0x04, 0x05
-
-gUnknown_8463FBE:: @ 8463FBE
- .byte 0xff, 0x00, 0x01
-
-gUnknown_8463FC1:: @ 8463FC1
- .byte 0xfe, 0xff, 0x00, 0x01, 0x02
-
-gUnknown_8463FC6:: @ 8463FC6
- .byte 0xfd, 0xfe, 0xff, 0x00, 0x01, 0x02, 0x03
-
-gUnknown_8463FCD:: @ 8463FCD
- .byte 0xfb, 0xfd, 0xff, 0x00, 0x01, 0x03, 0x05
-
-gUnknown_8463FD4:: @ 8463FD4
- .byte 0x01, 0x01, 0x00, 0xff, 0xff, 0x00, 0xff, 0xff, 0x00, 0x01, 0x01
-
-gUnknown_8463FDF:: @ 8463FDF
- .byte 0x02, 0x01, 0x00, 0xff, 0xfe, 0x00, 0xfe, 0xff, 0x00, 0x01, 0x02
-
-gUnknown_8463FEA:: @ 8463FEA
- .byte 0x02, 0x01, 0x01, 0x00, 0xff, 0xff, 0xfe, 0x00, 0xfe, 0xff, 0xff, 0x00, 0x01, 0x01, 0x02, 0x00, 0x00, 0x00
-
-gUnknown_8463FFC:: @ 8463FFC
- .4byte gUnknown_8E9B578
- .4byte gUnknown_8463AAC
- .4byte gUnknown_8463ACC
diff --git a/include/strings.h b/include/strings.h
index 81441d2bc..ce1a41a98 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -1504,5 +1504,16 @@ extern const u8 gUnknown_8419C2A[];
extern const u8 gUnknown_8419C7B[];
extern const u8 gUnknown_8419CA9[];
extern const u8 gUnknown_8419CB9[];
+extern const u8 gUnknown_8419B44[];
+extern const u8 gUnknown_8419B7B[];
+extern const u8 gUnknown_8419BAE[];
+extern const u8 gUnknown_8419BDB[];
+extern const u8 gUnknown_8419A3D[];
+extern const u8 gUnknown_8419B18[];
+extern const u8 gUnknown_8419A6E[];
+extern const u8 gUnknown_8419B18[];
+extern const u8 gUnknown_8419AA2[];
+extern const u8 gUnknown_8419ADE[];
+extern const u8 gUnknown_8419B18[];
#endif //GUARD_STRINGS_H
diff --git a/ld_script.txt b/ld_script.txt
index 30b9c1b30..2626da3ff 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -572,7 +572,7 @@ SECTIONS {
src/tm_case.o(.rodata);
src/menu_indicators.o(.rodata);
src/pokedex_area_markers.o(.rodata);
- data/pokemon_summary_screen.o(.rodata);
+ src/pokemon_summary_screen.o(.rodata);
src/help_system.o(.rodata);
src/wild_pokemon_area.o(.rodata);
src/dynamic_placeholder_text_util.o(.rodata);
diff --git a/src/data/text/nature_names.h b/src/data/text/nature_names.h
new file mode 100644
index 000000000..d0d217d9b
--- /dev/null
+++ b/src/data/text/nature_names.h
@@ -0,0 +1,54 @@
+static const u8 sHardyNatureName[] = _("HARDY");
+static const u8 sLonelyNatureName[] = _("LONELY");
+static const u8 sBraveNatureName[] = _("BRAVE");
+static const u8 sAdamantNatureName[] = _("ADAMANT");
+static const u8 sNaughtyNatureName[] = _("NAUGHTY");
+static const u8 sBoldNatureName[] = _("BOLD");
+static const u8 sDocileNatureName[] = _("DOCILE");
+static const u8 sRelaxedNatureName[] = _("RELAXED");
+static const u8 sImpishNatureName[] = _("IMPISH");
+static const u8 sLaxNatureName[] = _("LAX");
+static const u8 sTimidNatureName[] = _("TIMID");
+static const u8 sHastyNatureName[] = _("HASTY");
+static const u8 sSeriousNatureName[] = _("SERIOUS");
+static const u8 sJollyNatureName[] = _("JOLLY");
+static const u8 sNaiveNatureName[] = _("NAIVE");
+static const u8 sModestNatureName[] = _("MODEST");
+static const u8 sMildNatureName[] = _("MILD");
+static const u8 sQuietNatureName[] = _("QUIET");
+static const u8 sBashfulNatureName[] = _("BASHFUL");
+static const u8 sRashNatureName[] = _("RASH");
+static const u8 sCalmNatureName[] = _("CALM");
+static const u8 sGentleNatureName[] = _("GENTLE");
+static const u8 sSassyNatureName[] = _("SASSY");
+static const u8 sCarefulNatureName[] = _("CAREFUL");
+static const u8 sQuirkyNatureName[] = _("QUIRKY");
+
+const u8 *const gNatureNamePointers[] =
+{
+ [NATURE_HARDY] = sHardyNatureName,
+ [NATURE_LONELY] = sLonelyNatureName,
+ [NATURE_BRAVE] = sBraveNatureName,
+ [NATURE_ADAMANT] = sAdamantNatureName,
+ [NATURE_NAUGHTY] = sNaughtyNatureName,
+ [NATURE_BOLD] = sBoldNatureName,
+ [NATURE_DOCILE] = sDocileNatureName,
+ [NATURE_RELAXED] = sRelaxedNatureName,
+ [NATURE_IMPISH] = sImpishNatureName,
+ [NATURE_LAX] = sLaxNatureName,
+ [NATURE_TIMID] = sTimidNatureName,
+ [NATURE_HASTY] = sHastyNatureName,
+ [NATURE_SERIOUS] = sSeriousNatureName,
+ [NATURE_JOLLY] = sJollyNatureName,
+ [NATURE_NAIVE] = sNaiveNatureName,
+ [NATURE_MODEST] = sModestNatureName,
+ [NATURE_MILD] = sMildNatureName,
+ [NATURE_QUIET] = sQuietNatureName,
+ [NATURE_BASHFUL] = sBashfulNatureName,
+ [NATURE_RASH] = sRashNatureName,
+ [NATURE_CALM] = sCalmNatureName,
+ [NATURE_GENTLE] = sGentleNatureName,
+ [NATURE_SASSY] = sSassyNatureName,
+ [NATURE_CAREFUL] = sCarefulNatureName,
+ [NATURE_QUIRKY] = sQuirkyNatureName,
+};
diff --git a/src/pokemon_summary_screen.c b/src/pokemon_summary_screen.c
index 086c9585b..d0f4384d9 100644
--- a/src/pokemon_summary_screen.c
+++ b/src/pokemon_summary_screen.c
@@ -186,8 +186,7 @@ struct PokemonSummaryScreenData
u8 ALIGNED(4) unk31B0[9];
u8 ALIGNED(4) unk31BC[13];
- u8 ALIGNED(4) unk31CC[20];
- u8 ALIGNED(4) pad31E0[0x20];
+ u8 ALIGNED(4) unk31CC[52];
} summary;
u8 ALIGNED(4) isEgg; /* 0x3200 */
@@ -333,73 +332,618 @@ extern const u32 gUnknown_8E9B750[];
extern const u32 gUnknown_8E9B950[];
extern const u32 gUnknown_8E9B598[];
extern const u32 gUnknown_8E9BA9C[];
-extern const u32 gUnknown_8463C80[];
-extern const u32 gUnknown_8463B88[];
extern const u32 gUnknown_8E9BBCC[];
extern const u16 gUnknown_8E9B310[];
extern const u32 gUnknown_8E9A460[];
+extern const u16 gUnknown_8E9B578[];
+extern const u32 gUnknown_8E9BF48[];
+extern const u16 gUnknown_8E9BF28[];
+extern const u32 gUnknown_8E9B4B8[];
+extern const u32 gUnknown_8E9B3F0[];
+extern const u16 gUnknown_8E9B578[];
-extern const u32 gUnknown_84636C0[];
-extern const u32 gUnknown_8463700[];
+static const u32 gUnknown_84636C0[] = INCBIN_U32("graphics/interface/pokesummary_unk_84636C0.gbapal");
+static const u16 gUnknown_84636E0[] = INCBIN_U16("graphics/interface/pokesummary_unk_84636E0.gbapal");
+static const u32 gUnknown_8463700[] = INCBIN_U32("graphics/interface/pokesummary_unk_8463700.gbapal");
+static const u16 gUnknown_8463720[] = INCBIN_U16("graphics/interface/pokesummary_unk_8463720.gbapal");
+static const u32 gUnknown_8463740[] = INCBIN_U32("graphics/interface/pokesummary_unk_8463740.4bpp.lz");
+static const u32 gUnknown_846386C[] = INCBIN_U32("graphics/interface/pokesummary_unk_846386C.4bpp.lz");
+
+static const struct OamData gUnknown_846398C =
+{
+ .y = 0,
+ .affineMode = ST_OAM_AFFINE_OFF,
+ .objMode = ST_OAM_OBJ_NORMAL,
+ .mosaic = FALSE,
+ .bpp = ST_OAM_4BPP,
+ .shape = SPRITE_SHAPE(64x32),
+ .x = 0,
+ .matrixNum = 0,
+ .size = SPRITE_SIZE(64x32),
+ .tileNum = 0,
+ .priority = 0,
+ .paletteNum = 0
+};
-extern const struct BgTemplate gUnknown_8463EFC[4];
+static const union AnimCmd gUnknown_8463994[] =
+{
+ ANIMCMD_FRAME(0, 20),
+ ANIMCMD_JUMP(0),
+};
-extern const u8 gUnknown_8463FA4[][3];
-extern const u8 gUnknown_8463EF0[][3];
+static const union AnimCmd gUnknown_846399C[] =
+{
+ ANIMCMD_FRAME(0x20, 20),
+ ANIMCMD_JUMP(0),
+};
-extern const u8 * const gUnknown_8463EC4[];
-extern const u8 * const gUnknown_8463ED4[];
+static const union AnimCmd * const gUnknown_84639A4[] =
+{
+ gUnknown_8463994,
+ gUnknown_846399C
+};
-extern const struct WindowTemplate gUnknown_8463F9C[];
-extern const struct WindowTemplate gUnknown_8463F0C[];
-extern const struct WindowTemplate gUnknown_8463F3C[];
-extern const struct WindowTemplate gUnknown_8463F5C[];
-extern const struct WindowTemplate gUnknown_8463F7C[];
-extern const struct WindowTemplate gUnknown_8463F24[];
+static const struct OamData gUnknown_84639AC = {
+ .y = 0,
+ .affineMode = ST_OAM_AFFINE_OFF,
+ .objMode = ST_OAM_OBJ_NORMAL,
+ .mosaic = FALSE,
+ .bpp = ST_OAM_4BPP,
+ .shape = SPRITE_SHAPE(32x8),
+ .x = 0,
+ .matrixNum = 0,
+ .size = SPRITE_SIZE(32x8),
+ .tileNum = 0,
+ .priority = 0,
+ .paletteNum = 0
+};
-extern const s8 gUnknown_8463FBE[3];
-extern const s8 gUnknown_8463FC1[5];
-extern const s8 gUnknown_8463FC6[7];
-extern const s8 gUnknown_8463FCD[7];
+static const union AnimCmd gUnknown_84639B4[] =
+{
+ ANIMCMD_FRAME(0, 20),
+ ANIMCMD_JUMP(0),
+};
-extern const s8 gUnknown_8463FD4[11];
-extern const s8 gUnknown_8463FDF[11];
-extern const s8 gUnknown_8463FEA[15];
+static const union AnimCmd gUnknown_84639BC[] =
+{
+ ANIMCMD_FRAME(4, 20),
+ ANIMCMD_JUMP(0),
+};
-extern const u32 gUnknown_8463740[];
-extern const u32 gUnknown_846386C[];
+static const union AnimCmd gUnknown_84639C4[] =
+{
+ ANIMCMD_FRAME(8, 20),
+ ANIMCMD_JUMP(0),
+};
-extern const u16 gUnknown_8463720[];
-extern const struct OamData gUnknown_846398C;
-extern const union AnimCmd * const gUnknown_84639A4[];
+static const union AnimCmd gUnknown_84639CC[] =
+{
+ ANIMCMD_FRAME(12, 20),
+ ANIMCMD_JUMP(0),
+};
-extern const u32 gUnknown_8E9BF48[];
-extern const u16 gUnknown_8E9BF28[];
+static const union AnimCmd gUnknown_84639D4[] =
+{
+ ANIMCMD_FRAME(16, 20),
+ ANIMCMD_JUMP(0),
+};
-extern const struct OamData gUnknown_84639AC;
-extern const union AnimCmd * const gUnknown_84639F4[];
+static const union AnimCmd gUnknown_84639DC[] =
+{
+ ANIMCMD_FRAME(20, 20),
+ ANIMCMD_JUMP(0),
+};
-extern const u32 gUnknown_8E9B4B8[];
-extern const u16 * const gUnknown_8463FFC[];
-extern const struct OamData gUnknown_8463A14;
-extern const union AnimCmd * const gUnknown_8463A7C[];
+static const union AnimCmd gUnknown_84639E4[] =
+{
+ ANIMCMD_FRAME(24, 20),
+ ANIMCMD_JUMP(0),
+};
-extern const u32 gUnknown_8E9B3F0[];
-extern const u16 gUnknown_8E9B578[];
+static const union AnimCmd gUnknown_84639EC[] =
+{
+ ANIMCMD_FRAME(28, 20),
+ ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd * const gUnknown_84639F4[] =
+{
+ gUnknown_84639B4,
+ gUnknown_84639BC,
+ gUnknown_84639C4,
+ gUnknown_84639CC,
+ gUnknown_84639D4,
+ gUnknown_84639DC,
+ gUnknown_84639E4,
+ gUnknown_84639EC
+};
+
+static const struct OamData gUnknown_8463A14 = {
+ .y = 0,
+ .affineMode = ST_OAM_AFFINE_OFF,
+ .objMode = ST_OAM_OBJ_NORMAL,
+ .mosaic = FALSE,
+ .bpp = ST_OAM_4BPP,
+ .shape = SPRITE_SHAPE(8x8),
+ .x = 0,
+ .matrixNum = 0,
+ .size = SPRITE_SIZE(8x8),
+ .tileNum = 0,
+ .priority = 0,
+ .paletteNum = 0
+};
+
+static const union AnimCmd gUnknown_8463A1C[] =
+{
+ ANIMCMD_FRAME(0, 20),
+ ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd gUnknown_8463A24[] =
+{
+ ANIMCMD_FRAME(1, 20),
+ ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd gUnknown_8463A2C[] =
+{
+ ANIMCMD_FRAME(2, 20),
+ ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd gUnknown_8463A34[] =
+{
+ ANIMCMD_FRAME(3, 20),
+ ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd gUnknown_8463A3C[] =
+{
+ ANIMCMD_FRAME(4, 20),
+ ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd gUnknown_8463A44[] =
+{
+ ANIMCMD_FRAME(5, 20),
+ ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd gUnknown_8463A4C[] =
+{
+ ANIMCMD_FRAME(6, 20),
+ ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd gUnknown_8463A54[] =
+{
+ ANIMCMD_FRAME(7, 20),
+ ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd gUnknown_8463A5C[] =
+{
+ ANIMCMD_FRAME(8, 20),
+ ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd gUnknown_8463A64[] =
+{
+ ANIMCMD_FRAME(9, 20),
+ ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd gUnknown_8463A6C[] =
+{
+ ANIMCMD_FRAME(10, 20),
+ ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd gUnknown_8463A74[] =
+{
+ ANIMCMD_FRAME(11, 20),
+ ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd * const gUnknown_8463A7C[] =
+{
+ gUnknown_8463A1C,
+ gUnknown_8463A24,
+ gUnknown_8463A2C,
+ gUnknown_8463A34,
+ gUnknown_8463A3C,
+ gUnknown_8463A44,
+ gUnknown_8463A4C,
+ gUnknown_8463A54,
+ gUnknown_8463A5C,
+ gUnknown_8463A64,
+ gUnknown_8463A6C,
+ gUnknown_8463A74
+};
+
+const u16 gUnknown_8463AAC[] = INCBIN_U16("graphics/interface/pokesummary_unk_8463AAC.gbapal");
+const u16 gUnknown_8463ACC[] = INCBIN_U16("graphics/interface/pokesummary_unk_8463ACC.gbapal");
+
+static const struct OamData gUnknown_8463AEC = {
+ .y = 0,
+ .affineMode = ST_OAM_AFFINE_OFF,
+ .objMode = ST_OAM_OBJ_NORMAL,
+ .mosaic = FALSE,
+ .bpp = ST_OAM_4BPP,
+ .shape = SPRITE_SHAPE(8x8),
+ .x = 0,
+ .matrixNum = 0,
+ .size = SPRITE_SIZE(8x8),
+ .tileNum = 0,
+ .priority = 0,
+ .paletteNum = 0
+};
+
+static const union AnimCmd gUnknown_8463AF4[] =
+{
+ ANIMCMD_FRAME(0, 20),
+ ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd * const gUnknown_8463AFC[] =
+{
+ gUnknown_8463AF4
+};
+
+static const u16 gUnknown_8463B00[] = INCBIN_U16("graphics/interface/pokesummary_unk_8463B00.gbapal");
+static const u32 gUnknown_8463B20[] = INCBIN_U32("graphics/interface/pokesummary_unk_8463B20.4bpp.lz");
+
+static const struct OamData gUnknown_8463B30 =
+{
+ .y = 0,
+ .affineMode = ST_OAM_AFFINE_OFF,
+ .objMode = ST_OAM_OBJ_NORMAL,
+ .mosaic = FALSE,
+ .bpp = ST_OAM_4BPP,
+ .shape = SPRITE_SHAPE(8x8),
+ .x = 0,
+ .matrixNum = 0,
+ .size = SPRITE_SIZE(8x8),
+ .tileNum = 0,
+ .priority = 0,
+ .paletteNum = 0
+};
+
+static const union AnimCmd gUnknown_8463B38[] =
+{
+ ANIMCMD_FRAME(1, 20),
+ ANIMCMD_JUMP(0),
+};
+
+static const union AnimCmd * const gUnknown_8463B40[] =
+{
+ gUnknown_8463B38
+};
+
+static const u16 gUnknown_8463B44[] = INCBIN_U16( "graphics/interface/pokesummary_unk_8463B44.gbapal");
+static const u32 gUnknown_8463B64[] = INCBIN_U32( "graphics/interface/pokesummary_unk_8463B64.4bpp.lz");
+static const u32 gUnknown_8463B88[] = INCBIN_U32( "graphics/interface/pokesummary_unk_8463B88.bin.lz");
+static const u32 gUnknown_8463C80[] = INCBIN_U32( "graphics/interface/pokesummary_unk_8463C80.bin.lz");
+
+#include "data/text/nature_names.h"
-extern const u32 gUnknown_8463B20[];
-extern const u16 gUnknown_8463B00[];
+static const u8 * const gUnknown_8463EC4[] = {
+ gUnknown_8419B44,
+ gUnknown_8419B7B,
+ gUnknown_8419BAE,
+ gUnknown_8419BDB
+};
+
+static const u8 * const gUnknown_8463ED4[] = {
+ gUnknown_8419A3D,
+ gUnknown_8419B18,
+ gUnknown_8419A6E,
+ gUnknown_8419B18,
+ gUnknown_8419AA2,
+ gUnknown_8419ADE,
+ gUnknown_8419B18
+};
-extern const struct OamData gUnknown_8463AEC;
-extern const union AnimCmd * const gUnknown_8463AFC[];
+static const u8 gUnknown_8463EF0[][3] = {
+ {0, 7, 8},
+ {0, 1, 2},
+ {0, 3, 4},
+ {0, 5, 6}
+};
+
+static const struct BgTemplate gUnknown_8463EFC[] =
+{
+ {
+ .bg = 0,
+ .charBaseIndex = 0,
+ .mapBaseIndex = 14,
+ .screenSize = 1,
+ .paletteMode = 0,
+ .priority = 0,
+ .baseTile = 0x0000
+ },
+ {
+ .bg = 2,
+ .charBaseIndex = 2,
+ .mapBaseIndex = 10,
+ .screenSize = 1,
+ .paletteMode = 0,
+ .priority = 1,
+ .baseTile = 0x0000
+ },
+ {
+ .bg = 3,
+ .charBaseIndex = 2,
+ .mapBaseIndex = 9,
+ .screenSize = 0,
+ .paletteMode = 0,
+ .priority = 3,
+ .baseTile = 0x0000
+ },
+ {
+ .bg = 1,
+ .charBaseIndex = 2,
+ .mapBaseIndex = 12,
+ .screenSize = 1,
+ .paletteMode = 0,
+ .priority = 2,
+ .baseTile = 0x0000
+ }
+};
-extern const u32 gUnknown_8463B64[];
-extern const u16 gUnknown_8463B44[];
-extern const struct OamData gUnknown_8463B30;
-extern const union AnimCmd * const gUnknown_8463B40[];
+static const struct WindowTemplate gUnknown_8463F0C[] =
+{
+ {
+ .bg = 1,
+ .tilemapLeft = 0,
+ .tilemapTop = 0,
+ .width = 13,
+ .height = 2,
+ .paletteNum = 7,
+ .baseBlock = 0x0258
+ },
+ {
+ .bg = 1,
+ .tilemapLeft = 19,
+ .tilemapTop = 0,
+ .width = 11,
+ .height = 2,
+ .paletteNum = 7,
+ .baseBlock = 0x0272
+ },
+ {
+ .bg = 1,
+ .tilemapLeft = 0,
+ .tilemapTop = 2,
+ .width = 15,
+ .height = 2,
+ .paletteNum = 7,
+ .baseBlock = 0x0288
+ }
+};
+
+static const struct WindowTemplate gUnknown_8463F24[] =
+{
+ {
+ .bg = 2,
+ .tilemapLeft = 0,
+ .tilemapTop = 0,
+ .width = 13,
+ .height = 2,
+ .paletteNum = 7,
+ .baseBlock = 0x0258
+ },
+ {
+ .bg = 2,
+ .tilemapLeft = 19,
+ .tilemapTop = 0,
+ .width = 11,
+ .height = 2,
+ .paletteNum = 7,
+ .baseBlock = 0x0272
+ },
+ {
+ .bg = 2,
+ .tilemapLeft = 0,
+ .tilemapTop = 2,
+ .width = 15,
+ .height = 2,
+ .paletteNum = 7,
+ .baseBlock = 0x0288
+ },
+};
+
+static const struct WindowTemplate gUnknown_8463F3C[] =
+{
+ {
+ .bg = 0,
+ .tilemapLeft = 15,
+ .tilemapTop = 2,
+ .width = 15,
+ .height = 12,
+ .paletteNum = 6,
+ .baseBlock = 0x0001
+ },
+ {
+ .bg = 0,
+ .tilemapLeft = 1,
+ .tilemapTop = 14,
+ .width = 28,
+ .height = 6,
+ .paletteNum = 6,
+ .baseBlock = 0x00b5
+ },
+ {
+ .bg = 0,
+ .tilemapLeft = 0,
+ .tilemapTop = 0,
+ .width = 0,
+ .height = 0,
+ .paletteNum = 0,
+ .baseBlock = 0x0000
+ },
+ {
+ .bg = 0,
+ .tilemapLeft = 0,
+ .tilemapTop = 0,
+ .width = 0,
+ .height = 0,
+ .paletteNum = 0,
+ .baseBlock = 0x0000
+ },
+};
+
+static const struct WindowTemplate gUnknown_8463F5C[] =
+{
+ {
+ .bg = 0,
+ .tilemapLeft = 20,
+ .tilemapTop = 2,
+ .width = 10,
+ .height = 14,
+ .paletteNum = 6,
+ .baseBlock = 0x0001
+ },
+ {
+ .bg = 0,
+ .tilemapLeft = 6,
+ .tilemapTop = 12,
+ .width = 14,
+ .height = 4,
+ .paletteNum = 6,
+ .baseBlock = 0x008d
+ },
+ {
+ .bg = 0,
+ .tilemapLeft = 1,
+ .tilemapTop = 16,
+ .width = 29,
+ .height = 4,
+ .paletteNum = 6,
+ .baseBlock = 0x00c5
+ },
+ {
+ .bg = 0,
+ .tilemapLeft = 0,
+ .tilemapTop = 0,
+ .width = 0,
+ .height = 0,
+ .paletteNum = 0,
+ .baseBlock = 0x0000
+ },
+};
+
+static const struct WindowTemplate gUnknown_8463F7C[] =
+{
+ {
+ .bg = 0,
+ .tilemapLeft = 20,
+ .tilemapTop = 2,
+ .width = 10,
+ .height = 18,
+ .paletteNum = 8,
+ .baseBlock = 0x0001
+ },
+ {
+ .bg = 0,
+ .tilemapLeft = 0,
+ .tilemapTop = 7,
+ .width = 15,
+ .height = 13,
+ .paletteNum = 6,
+ .baseBlock = 0x00b5
+ },
+ {
+ .bg = 0,
+ .tilemapLeft = 15,
+ .tilemapTop = 2,
+ .width = 5,
+ .height = 18,
+ .paletteNum = 6,
+ .baseBlock = 0x0178
+ },
+ {
+ .bg = 0,
+ .tilemapLeft = 6,
+ .tilemapTop = 4,
+ .width = 9,
+ .height = 2,
+ .paletteNum = 6,
+ .baseBlock = 0x01d2
+ },
+};
+
+static const struct WindowTemplate gUnknown_8463F9C[] =
+{
+ {
+ .bg = 255,
+ .tilemapLeft = 0,
+ .tilemapTop = 0,
+ .width = 0,
+ .height = 0,
+ .paletteNum = 0,
+ .baseBlock = 0x0000
+ },
+};
+
+
+static const u8 gUnknown_8463FA4[][3] =
+{
+ {0, 14, 10},
+ {0, 1, 2},
+ {0, 9, 8},
+ {0, 5, 4},
+ {0, 2, 3},
+ {0, 11, 10},
+};
+
+static const u8 ALIGNED(4) gUnknown_8463FB8[] =
+{
+ 0, 2, 3, 1, 4, 5
+};
+
+static const s8 gUnknown_8463FBE[] =
+{
+ -1, 0, 1
+};
+
+static const s8 gUnknown_8463FC1[] =
+{
+ -2, -1, 0, 1, 2
+};
+
+static const s8 gUnknown_8463FC6[] =
+{
+ -3, -2, -1, 0, 1, 2, 3
+};
+
+static const s8 gUnknown_8463FCD[] =
+{
+ -5, -3, -1, 0, 1, 3, 5
+};
+
+static const s8 gUnknown_8463FD4[] =
+{
+ 1, 1, 0, -1, -1, 0, -1, -1, 0, 1, 1
+};
+
+static const s8 gUnknown_8463FDF[] =
+{
+ 2, 1, 0, -1, -2, 0, -2, -1, 0, 1, 2
+};
+
+static const s8 gUnknown_8463FEA[] =
+{
+ 2, 1, 1, 0, -1, -1, -2, 0, -2, -1, -1, 0, 1, 1, 2
+};
+
+static const u16 * const gUnknown_8463FFC[] =
+{
+ gUnknown_8E9B578,
+ gUnknown_8463AAC,
+ gUnknown_8463ACC,
+};
-extern const u16 gUnknown_84636E0[];
-extern const u8 gUnknown_8463FB8[];
#define FREE_AND_SET_NULL_IF_SET(ptr) \
{ \
@@ -1959,7 +2503,9 @@ void sub_8137270(void)
if (gMonSummaryScreen->mode == PSS_MODE_SELECT_MOVE)
sub_81372E4(4);
else
- AddTextPrinterParameterized3(gMonSummaryScreen->unk3000[3], 2, 3, MACRO_8137270(4), gUnknown_8463EF0[0], TEXT_SPEED_FF, gFameCheckerText_Cancel);
+ AddTextPrinterParameterized3(gMonSummaryScreen->unk3000[3], 2,
+ 3, MACRO_8137270(4),
+ gUnknown_8463EF0[0], TEXT_SPEED_FF, gFameCheckerText_Cancel);
}
}