summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSeth Barberee <seth.barberee@gmail.com>2021-04-19 21:55:40 -0700
committerGitHub <noreply@github.com>2021-04-19 23:55:40 -0500
commitf65dee5a143bd543c74c010d7252eb76893ee243 (patch)
treed343e826c63f8b501d37873c3c7bc1f010819deb /include
parentd316d1e359c7672277a9cf644acd4e40170f5968 (diff)
Wonder mail and some boss dialogues (#36)
* more wonder mail and main menu work * Lots of things.. doc'ing, decomping, and other things * continue decomping boss scenes * up to Suicune * up to Mewtwo dialogue * up to Raquaza * fix spelling error on Rayquaza and decomp a few more * up to groudon * divide > shift
Diffstat (limited to 'include')
-rw-r--r--include/code_8041D5C.h28
-rw-r--r--include/gUnknown_203B418.h36
-rw-r--r--include/gba/io_reg.h3
-rw-r--r--include/main_menu.h6
4 files changed, 69 insertions, 4 deletions
diff --git a/include/code_8041D5C.h b/include/code_8041D5C.h
index e0cf614..712aa2f 100644
--- a/include/code_8041D5C.h
+++ b/include/code_8041D5C.h
@@ -6,17 +6,39 @@ struct subStruct_8048524
u8 fill0[0x6];
u8 unk6;
u8 unk7;
- u8 fill8[0xAC - 0x8];
+ u8 fill8[0xE - 0x8];
+ s16 unkE; // HP??
+ s16 unk10;
+ u8 fill12[0x46 - 0x12];
+ u8 unk46;
+ u8 fill47[0xA4 - 0x47];
+ u8 unkA4;
+ u8 fillA5[0xAC - 0xA5];
u8 unkAC;
- u8 fillAD[0x112 - 0xAD];
+ u8 fillAD[0xFB - 0xAD];
+ u8 unkFB;
+ u8 fillFC[0x112 - 0xFC];
u8 unk112;
u8 fill113[0x13C - 0x113];
u32 unk13C;
+ u8 fill140[0x15C - 0x140];
+ u8 unk15C;
+ u8 unk15D;
+ u8 unk15E;
+ u8 unk15F;
+ u8 fill160[0x174 - 0x160];
+ u32 unk174;
};
struct unkDungeon_8041D5C
{
- u8 padding[0x70];
+ u8 fill0[4];
+ s16 unk4;
+ s16 unk6;
+ u32 unk8;
+ s32 unkC;
+ s32 unk10;
+ u8 fill14[0x70 - 0x14];
struct subStruct_8048524 *unk70;
};
diff --git a/include/gUnknown_203B418.h b/include/gUnknown_203B418.h
new file mode 100644
index 0000000..a3e287a
--- /dev/null
+++ b/include/gUnknown_203B418.h
@@ -0,0 +1,36 @@
+#include "code_8041D5C.h"
+
+struct unkStruct_203B418
+{
+ u8 unk0;
+ u8 unk1;
+ u8 unk2;
+ u8 unk3;
+ u8 unk4;
+ u8 fill5[2];
+ u8 unk7;
+ u8 fill8[0x11 - 8];
+ u8 unk11;
+ u8 fill12[0xE23C - 0x12];
+ s16 unkE23C;
+ s16 unkE23E;
+ u8 fillE240[0xE265 - 0xE240];
+ u8 unkE265;
+ u8 fillE266[0xE26B - 0xE266];
+ u8 unkE26B;
+ u8 unkE26C;
+ u8 fillE26D[0x1356C - 0xE26D];
+ u8 unk1356C;
+ u8 fill1356D[0x1358C - 0x1356D];
+ struct unkDungeon_8041D5C *unk1358C[0x10];
+ u8 fill135CC[0x181FC - 0x135CC];
+ u32 unk181FC;
+ u32 unk18200;
+ u32 unk18204;
+ u8 unk18208[3];
+ u8 unk1820B;
+ u32 unk1820C;
+ u32 unk18210;
+ u8 padding2[3];
+ u8 unk18217;
+};
diff --git a/include/gba/io_reg.h b/include/gba/io_reg.h
index 2453645..e50b580 100644
--- a/include/gba/io_reg.h
+++ b/include/gba/io_reg.h
@@ -597,6 +597,9 @@
// BLDALPHA
#define BLDALPHA_BLEND(target1, target2) (((target2) << 8) | (target1))
+// There is one time that we need to reverse the OR to match in PMD
+#define BLDALPHA_BLEND1(target1, target2) ((target1) | ((target2) << 8))
+
// SOUNDCNT_H
#define SOUND_CGB_MIX_QUARTER 0x0000
#define SOUND_CGB_MIX_HALF 0x0001
diff --git a/include/main_menu.h b/include/main_menu.h
index 824cee4..db92f83 100644
--- a/include/main_menu.h
+++ b/include/main_menu.h
@@ -4,12 +4,16 @@
enum MainMenuScreens
{
MENU_MAIN_SCREEN = 1,
+ MENU_NEW_GAME = 3,
+ MENU_AWAITING_RESCUE = 6,
MENU_CONTINUE = 7,
MENU_DELETE_SAVE_PROMPT,
MENU_ADVENTURE_LOG = 10,
MENU_FRIEND_RESCUE,
MENU_TRADE_ITEMS,
MENU_WONDER_MAIL,
+ MENU_DUAL_SLOT,
+ MENU_WIRELESS_COMMS,
MENU_DEBUG = 16,
MENU_COMMUNICATION_1 = 19,
MENU_COMMUNICATION_2,
@@ -39,7 +43,7 @@ struct MainMenu
/* 0x8 */ s32 lastMenu;
u8 padding[0x20];
/* 0x2C */ struct MainMenuSub sub;
- u32 unk30;
+ u8 unk30;
u32 unk34;
s16 unk38;
u8 unk3A;