summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorgarak <garakmon@gmail.com>2019-07-19 17:23:52 -0400
committergarak <garakmon@gmail.com>2019-07-19 17:23:52 -0400
commitb68ab6106d59902c7aef7bb2d7058a3945849ece (patch)
tree694f74446fd488ccd84d006e6d8b0bca27b0177b
parent3f762629e830c0cad66c4efeea5b918bdf4cce20 (diff)
pokenav unk 2 data decomp
-rw-r--r--asm/pokenav_unk_2.s2
-rw-r--r--data/pokenav.s190
-rw-r--r--include/strings.h16
-rw-r--r--ld_script.txt1
-rw-r--r--src/pokenav_unk_2.c255
5 files changed, 273 insertions, 191 deletions
diff --git a/asm/pokenav_unk_2.s b/asm/pokenav_unk_2.s
index 89a8bde9e..da83ccf55 100644
--- a/asm/pokenav_unk_2.s
+++ b/asm/pokenav_unk_2.s
@@ -943,7 +943,7 @@ sub_81CA0C8: @ 81CA0C8
lsls r2, r0, 3
subs r2, r0
lsls r2, 2
- ldr r1, =gUnknown_08620244
+ ldr r1, =gUnknown_08620240+4
adds r0, r2, r1
subs r1, 0x4
adds r2, r1
diff --git a/data/pokenav.s b/data/pokenav.s
index 2ed2cf9a0..7c2e89be9 100644
--- a/data/pokenav.s
+++ b/data/pokenav.s
@@ -3,196 +3,6 @@
.section .rodata
-// pokenav_unk_2.s
-gUnknown_0861FC78:: @ 861FC78
- .incbin "graphics/pokenav/bg.gbapal"
-
-gUnknown_0861FC98:: @ 861FC98
- .incbin "graphics/pokenav/bg.4bpp.lz"
-
-gUnknown_0861FCAC:: @ 861FCAC
- .incbin "graphics/pokenav/bg.bin.lz"
-
-gUnknown_0861FD4C:: @ 861FD4C
- .incbin "graphics/pokenav/outline.gbapal"
-
-gUnknown_0861FD6C:: @ 861FD6C
- .incbin "graphics/pokenav/outline.4bpp.lz"
-
-gUnknown_0861FFF4:: @ 861FFF4
- .incbin "graphics/pokenav/outline_map.bin.lz"
-
-gUnknown_08620104:: @ 8620104
- .incbin "graphics/pokenav/blue_light.gbapal"
-
-gUnknown_08620124:: @ 8620124
- .incbin "graphics/pokenav/blue_light.4bpp.lz"
-
-gUnknown_08620194:: @ 8620194
- .byte 0xF5, 0x10, 0, 0, 0x7A, 0x21, 0, 0, 0xFF, 0x31, 0, 0
-
-gUnknown_086201A0:: @ 86201A0
- .4byte NULL
- .4byte sub_81C9C6C
- .4byte sub_81C9CA8
- .4byte sub_81C9D44
- .4byte sub_81C9DD8
- .4byte sub_81C9E58
- .4byte sub_81C9EC8
- .4byte sub_81C9EF8
- .4byte sub_81C9F28
-
-gUnknown_086201C4:: @ 86201C4
- .4byte gPokenavOptions_Gfx
- .byte 0, 0x34, 3, 0
- .4byte gUnknown_08620124
- .byte 0, 1, 1, 0
-
-gUnknown_086201D4:: @ 86201D4
- .4byte gPokenavOptions_Pal + 0x0, 4
- .4byte gPokenavOptions_Pal + 0x20, 5
- .4byte gPokenavOptions_Pal + 0x40, 6
- .4byte gPokenavOptions_Pal + 0x60, 7
- .4byte gPokenavOptions_Pal + 0x80, 8
- .4byte gUnknown_08620104, 3
- .4byte 0, 0
-
-gUnknown_0862020C:: @ 862020C
- .2byte 0, 0
-
-gUnknown_08620210:: @ 8620210
- .2byte 0x20, 1
-
-gUnknown_08620214:: @ 8620214
- .2byte 0x40, 4
-
-gUnknown_08620218:: @ 8620218
- .2byte 0x60, 2
-
-gUnknown_0862021C:: @ 862021C
- .2byte 0x80, 3
-
-gUnknown_08620220:: @ 8620220
- .2byte 0xA0, 1
-
-gUnknown_08620224:: @ 8620224
- .2byte 0xC0, 1
-
-gUnknown_08620228:: @ 8620228
- .2byte 0xE0, 4
-
-gUnknown_0862022C:: @ 862022C
- .2byte 0x100, 1
-
-gUnknown_08620230:: @ 8620230
- .2byte 0x120, 2
-
-gUnknown_08620234:: @ 8620234
- .2byte 0x140, 0
-
-gUnknown_08620238:: @ 8620238
- .2byte 0x160, 0
-
-gUnknown_0862023C:: @ 862023C
- .2byte 0x180, 3
-
-gUnknown_08620240:: @ 8620240
- .2byte 0x2A, 0x14
-
-gUnknown_08620244:: @ 8620244
- .4byte gUnknown_0862020C
- .4byte gUnknown_08620210
- .4byte gUnknown_0862021C
- .4byte NULL
- .4byte NULL
- .4byte NULL
- .2byte 0x2A, 0x14
- .4byte gUnknown_0862020C
- .4byte gUnknown_08620210
- .4byte gUnknown_08620214
- .4byte gUnknown_0862021C
- .4byte NULL
- .4byte NULL
- .2byte 0x2A, 0x14
- .4byte gUnknown_0862020C
- .4byte gUnknown_08620210
- .4byte gUnknown_08620214
- .4byte gUnknown_08620218
- .4byte gUnknown_0862021C
- .4byte NULL
- .2byte 0x38, 0x14
- .4byte gUnknown_08620220
- .4byte gUnknown_08620224
- .4byte gUnknown_0862023C
- .4byte NULL
- .4byte NULL
- .4byte NULL
- .2byte 0x28, 0x10
- .4byte gUnknown_08620228
- .4byte gUnknown_0862022C
- .4byte gUnknown_08620230
- .4byte gUnknown_08620234
- .4byte gUnknown_08620238
- .4byte gUnknown_0862023C
-
-gUnknown_086202CC:: @ 86202CC
- window_template 1, 3, 17, 0x18, 2, 1, 8
-
-gUnknown_086202D4:: @ 86202D4
- .4byte gUnknown_085EBCC5
- .4byte gUnknown_085EBCE8
- .4byte gUnknown_085EBD01
- .4byte gUnknown_085EBD1C
- .4byte gUnknown_085EBD34
- .4byte gUnknown_085EBD83
- .4byte gUnknown_085EBDA2
- .4byte gUnknown_085EBDBF
- .4byte gUnknown_085EBDDB
- .4byte gUnknown_085EBDEE
- .4byte gUnknown_085EBE06
- .4byte gUnknown_085EBE19
- .4byte gUnknown_085EBE2D
- .4byte gUnknown_085EBE41
-
-gUnknown_0862030C:: @ 862030C
- .byte 6, 8, 7
-
-gUnknown_0862030F:: @ 862030F
- .byte 6, 8, 7, 0, 0
-
-gUnknown_08620314:: @ 8620314
- .byte 0, 0x40, 0, 0x80, 0, 8, 0, 0
-
-gUnknown_0862031C:: @ 862031C
- obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
- obj_rot_scal_anim_end
-
-gUnknown_0862032C:: @ 862032C
- obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
- obj_rot_scal_anim_frame 0x10, 0x10, 0, 0x12
- obj_rot_scal_anim_end
-
-gUnknown_08620344:: @ 8620344
- .4byte gUnknown_0862031C
- .4byte gUnknown_0862032C
-
-gUnknown_0862034C:: @ 862034C
- spr_template 3, 4, gUnknown_08620314, gDummySpriteAnimTable, NULL, gUnknown_08620344, SpriteCallbackDummy
-
-gUnknown_08620364:: @ 8620364
- .2byte 0x4000
- .2byte 0x8000
- .2byte 0x800
- .2byte 0
-
-gUnknown_0862036C:: @ 862036C
- spr_template 1, 3, gUnknown_08620364, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gUnknown_08620384:: @ 8620384
- .4byte 0x4000040
- .4byte 0xa2600001
- .byte 1, 0, 0, 0
-
// pokenav_unk_3.s
gUnknown_08620390:: @ 8620390
.string "Becalm fighting emotions.$"
diff --git a/include/strings.h b/include/strings.h
index e373a5660..3dd86f60a 100644
--- a/include/strings.h
+++ b/include/strings.h
@@ -2723,4 +2723,20 @@ extern const u8 gText_NumberOfBattles[];
extern const u8 gText_Unknown[];
extern const u8 gText_TrainerCloseBy[];
+// pokenav_unk_2
+extern const u8 gUnknown_085EBCC5[];
+extern const u8 gUnknown_085EBCE8[];
+extern const u8 gUnknown_085EBD01[];
+extern const u8 gUnknown_085EBD1C[];
+extern const u8 gUnknown_085EBD34[];
+extern const u8 gUnknown_085EBD83[];
+extern const u8 gUnknown_085EBDA2[];
+extern const u8 gUnknown_085EBDBF[];
+extern const u8 gUnknown_085EBDDB[];
+extern const u8 gUnknown_085EBDEE[];
+extern const u8 gUnknown_085EBE06[];
+extern const u8 gUnknown_085EBE19[];
+extern const u8 gUnknown_085EBE2D[];
+extern const u8 gUnknown_085EBE41[];
+
#endif // GUARD_STRINGS_H
diff --git a/ld_script.txt b/ld_script.txt
index e8be7e76d..ad4f439cc 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -643,6 +643,7 @@ SECTIONS {
src/pokenav_main_menu.o(.rodata);
src/pokenav_match_call_ui.o(.rodata);
src/pokenav_unk_1.o(.rodata);
+ src/pokenav_unk_2.o(.rodata);
data/pokenav.o(.rodata);
src/pokenav_unk_10.o(.rodata);
src/pokenav_match_call_data.o(.rodata);
diff --git a/src/pokenav_unk_2.c b/src/pokenav_unk_2.c
index 3aec4685e..09416c31f 100644
--- a/src/pokenav_unk_2.c
+++ b/src/pokenav_unk_2.c
@@ -1,6 +1,261 @@
#include "global.h"
+#include "bg.h"
#include "gym_leader_rematch.h"
#include "pokenav.h"
+#include "sprite.h"
+#include "window.h"
+#include "strings.h"
+#include "scanline_effect.h"
+
+extern const u32 gPokenavOptions_Gfx[];
+extern const u16 gPokenavOptions_Pal[];
+
+const u16 gUnknown_0861FC78[] = INCBIN_U16("graphics/pokenav/bg.gbapal");
+const u32 gUnknown_0861FC98[] = INCBIN_U32("graphics/pokenav/bg.4bpp.lz");
+const u32 gUnknown_0861FCAC[] = INCBIN_U32("graphics/pokenav/bg.bin.lz");
+const u16 gUnknown_0861FD4C[] = INCBIN_U16("graphics/pokenav/outline.gbapal");
+const u32 gUnknown_0861FD6C[] = INCBIN_U32("graphics/pokenav/outline.4bpp.lz");
+const u32 gUnknown_0861FFF4[] = INCBIN_U32("graphics/pokenav/outline_map.bin.lz");
+const u16 gUnknown_08620104[] = INCBIN_U16("graphics/pokenav/blue_light.gbapal");
+const u32 gUnknown_08620124[] = INCBIN_U32("graphics/pokenav/blue_light.4bpp.lz");
+
+const struct BgTemplate gUnknown_08620194[3] =
+{
+ {
+ .bg = 1,
+ .charBaseIndex = 1,
+ .mapBaseIndex = 0x0F,
+ .screenSize = 0,
+ .paletteMode = 0,
+ .priority = 1,
+ .baseTile = 0
+ },
+ {
+ .bg = 2,
+ .charBaseIndex = 2,
+ .mapBaseIndex = 0x17,
+ .screenSize = 0,
+ .paletteMode = 0,
+ .priority = 2,
+ .baseTile = 0
+ },
+ {
+ .bg = 3,
+ .charBaseIndex = 3,
+ .mapBaseIndex = 0x1F,
+ .screenSize = 0,
+ .paletteMode = 0,
+ .priority = 3,
+ .baseTile = 0
+ }
+};
+
+u32 sub_81C9C6C(int);
+u32 sub_81C9CA8(int);
+u32 sub_81C9D44(int);
+u32 sub_81C9DD8(int);
+u32 sub_81C9E58(int);
+u32 sub_81C9EC8(int);
+u32 sub_81C9EF8(int);
+u32 sub_81C9F28(int);
+
+u32 (*const gUnknown_086201A0[])(int) =
+{
+ NULL,
+ sub_81C9C6C,
+ sub_81C9CA8,
+ sub_81C9D44,
+ sub_81C9DD8,
+ sub_81C9E58,
+ sub_81C9EC8,
+ sub_81C9EF8,
+ sub_81C9F28
+};
+
+const struct CompressedSpriteSheet gUnknown_086201C4[] =
+{
+ {
+ .data = gPokenavOptions_Gfx,
+ .size = 0x3400,
+ .tag = 0x0003
+ },
+ {
+ .data = gUnknown_08620124,
+ .size = 0x0100,
+ .tag = 0x0001
+ }
+};
+
+ const struct SpritePalette gUnknown_086201D4[] =
+ {
+ {gPokenavOptions_Pal + 0x00, 4},
+ {gPokenavOptions_Pal + 0x10, 5},
+ {gPokenavOptions_Pal + 0x20, 6},
+ {gPokenavOptions_Pal + 0x30, 7},
+ {gPokenavOptions_Pal + 0x40, 8},
+ {gUnknown_08620104, 3},
+ {}
+};
+
+const u16 gUnknown_0862020C[] = {0, 0};
+const u16 gUnknown_08620210[] = {0x20, 1};
+const u16 gUnknown_08620214[] = {0x40, 4};
+const u16 gUnknown_08620218[] = {0x60, 2};
+const u16 gUnknown_0862021C[] = {0x80, 3};
+const u16 gUnknown_08620220[] = {0xA0, 1};
+const u16 gUnknown_08620224[] = {0xC0, 1};
+const u16 gUnknown_08620228[] = {0xE0, 4};
+const u16 gUnknown_0862022C[] = {0x100, 1};
+const u16 gUnknown_08620230[] = {0x120, 2};
+const u16 gUnknown_08620234[] = {0x140, 0};
+const u16 gUnknown_08620238[] = {0x160, 0};
+const u16 gUnknown_0862023C[] = {0x180, 3};
+
+struct UnkStruct_08620240
+{
+ u16 unk0;
+ u16 unk2;
+ const u16 *unk4[6];
+};
+
+const struct UnkStruct_08620240 gUnknown_08620240[5] =
+{
+ {
+ 0x2A,
+ 0x14,
+ {gUnknown_0862020C, gUnknown_08620210, gUnknown_0862021C, NULL, NULL, NULL}
+ },
+ {
+ 0x2A,
+ 0x14,
+ {gUnknown_0862020C, gUnknown_08620210, gUnknown_08620214, gUnknown_0862021C, NULL, NULL}
+ },
+ {
+ 0x2A,
+ 0x14,
+ {gUnknown_0862020C, gUnknown_08620210, gUnknown_08620214, gUnknown_08620218, gUnknown_0862021C, NULL}
+ },
+ {
+ 0x38,
+ 0x14,
+ {gUnknown_08620220, gUnknown_08620224, gUnknown_0862023C, NULL, NULL, NULL}
+ },
+ {
+ 0x28,
+ 0x10,
+ {gUnknown_08620228, gUnknown_0862022C, gUnknown_08620230, gUnknown_08620234, gUnknown_08620238, gUnknown_0862023C}
+ },
+};
+
+const struct WindowTemplate gUnknown_086202CC =
+{
+ .bg = 1,
+ .tilemapLeft = 3,
+ .tilemapTop = 17,
+ .width = 0x18,
+ .height = 0x2,
+ .paletteNum = 1,
+ .baseBlock = 8
+};
+
+const u8 *const gUnknown_086202D4[] =
+{
+ gUnknown_085EBCC5,
+ gUnknown_085EBCE8,
+ gUnknown_085EBD01,
+ gUnknown_085EBD1C,
+ gUnknown_085EBD34,
+ gUnknown_085EBD83,
+ gUnknown_085EBDA2,
+ gUnknown_085EBDBF,
+ gUnknown_085EBDDB,
+ gUnknown_085EBDEE,
+ gUnknown_085EBE06,
+ gUnknown_085EBE19,
+ gUnknown_085EBE2D,
+ gUnknown_085EBE41
+};
+
+const u8 gUnknown_0862030C[] = {6, 8, 7};
+
+const u8 gUnknown_0862030F[] = {6, 8, 7, 0, 0};
+
+const struct OamData gUnknown_08620314 =
+{
+ .y = 0,
+ .affineMode = 0,
+ .objMode = 0,
+ .bpp = 0,
+ .shape = SPRITE_SHAPE(32x16),
+ .x = 0,
+ .size = SPRITE_SIZE(32x16),
+ .tileNum = 0,
+ .priority = 2,
+ .paletteNum = 0,
+};
+
+const union AffineAnimCmd gUnknown_0862031C[] =
+{
+ AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
+ AFFINEANIMCMD_END,
+};
+
+const union AffineAnimCmd gUnknown_0862032C[] =
+{
+ AFFINEANIMCMD_FRAME(0x100, 0x100, 0, 0),
+ AFFINEANIMCMD_FRAME(0x10, 0x10, 0, 0x12),
+ AFFINEANIMCMD_END,
+};
+
+const union AffineAnimCmd *const gUnknown_08620344[] =
+{
+ gUnknown_0862031C,
+ gUnknown_0862032C
+};
+
+const struct SpriteTemplate gUnknown_0862034C =
+{
+ .tileTag = 3,
+ .paletteTag = 4,
+ .oam = &gUnknown_08620314,
+ .anims = gDummySpriteAnimTable,
+ .images = NULL,
+ .affineAnims = gUnknown_08620344,
+ .callback = SpriteCallbackDummy,
+};
+
+const struct OamData gUnknown_08620364 =
+{
+ .y = 0,
+ .affineMode = 0,
+ .objMode = 0,
+ .bpp = 0,
+ .shape = SPRITE_SHAPE(32x16),
+ .x = 0,
+ .size = SPRITE_SIZE(32x16),
+ .tileNum = 0,
+ .priority = 2,
+ .paletteNum = 0,
+};
+
+const struct SpriteTemplate gUnknown_0862036C =
+{
+ .tileTag = 1,
+ .paletteTag = 3,
+ .oam = &gUnknown_08620364,
+ .anims = gDummySpriteAnimTable,
+ .images = NULL,
+ .affineAnims = gDummySpriteAffineAnimTable,
+ .callback = SpriteCallbackDummy,
+};
+
+const struct ScanlineEffectParams gUnknown_08620384 =
+{
+ (void *)REG_ADDR_WIN0H,
+ ((DMA_ENABLE | DMA_START_HBLANK | DMA_REPEAT | DMA_DEST_RELOAD) << 16) | 1,
+ 1,
+ 0
+};
bool32 sub_81C98D4(void)
{