From 7c129f8037bc1660dd56d2b260ad8df84c438b71 Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Thu, 17 Jul 2025 20:09:18 -0700 Subject: [PATCH] More more data to src --- data/data_80E7D40.s | 23 ++++++----------------- src/code_803B344.c | 43 +++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 47 insertions(+), 19 deletions(-) diff --git a/data/data_80E7D40.s b/data/data_80E7D40.s index edae342ed..de265c30b 100644 --- a/data/data_80E7D40.s +++ b/data/data_80E7D40.s @@ -2,46 +2,35 @@ @ code_803B344 - .global gUnknown_80E7F94 -gUnknown_80E7F94: @ 80E7F94 -.macro st_80E7F94 a, b, c, e, f, g, h, i, j, k, m, n - .byte \a, \b, \c - .align 2, 0 - .4byte \e, \f - .2byte \g, \h - .byte \i, \j, \k - .align 2, 0 - .4byte \m, \n -.endm - st_80E7F94 5, 1, 4, 0xC2B, 0x123456, 0x19, 0x182, 0x38, 8, 0x3A, sUnknown_80E8088, sUnknown_80E8070 - st_80E7F94 5, 1, 4, 0x112C, 0x123456, 4, 0x115, 0x38, 8, 0x3A, sUnknown_80E8060, sUnknown_80E8048 - st_80E7F94 5, 1, 4, 0x112D, 0x123456, 1, 0x118, 0x38, 8, 0x3A, sUnknown_80E8038, sUnknown_80E8020 - st_80E7F94 5, 1, 0, 0x1B2E, 0x123456, 7, 0x9B, 0x38, 8, 0x3A, 0, 0 - st_80E7F94 5, 1, 0, 0x903, 0x123456, 0x98, 0x9E, 0x38, 8, 0x3A, 0, 0 - + .global sUnknown_80E8020 sUnknown_80E8020: @ 80E8020 .string "SHOW RESCUE 00\n" .string " EVENT02\0" .align 2, 0 + .global sUnknown_80E8038 sUnknown_80E8038: @ 80E8038 .string "SHOW　TITLE02\0" .align 2, 0 + .global sUnknown_80E8048 sUnknown_80E8048: @ 80E8048 .string "SHOW RESCUE 00\n" .string " EVENT01\0" .align 2, 0 + .global sUnknown_80E8060 sUnknown_80E8060: @ 80E8060 .string "SHOW　TITLE01\0" .align 2, 0 + .global sUnknown_80E8070 sUnknown_80E8070: @ 80E8070 .string "SHOW RESCUE 00\n" .string " EVENT00\0" .align 2, 0 + .global sUnknown_80E8088 sUnknown_80E8088: @ 80E8088 .string "SHOW　TITLE00\0" .align 2, 0 diff --git a/src/code_803B344.c b/src/code_803B344.c index ab7e3ea01..7bb814da8 100644 --- a/src/code_803B344.c +++ b/src/code_803B344.c @@ -1,5 +1,10 @@ #include "global.h" #include "globaldata.h" +#include "constants/dungeon.h" +#include "constants/friend_area.h" +#include "constants/item.h" +#include "constants/monster.h" +#include "constants/wonder_mail.h" #include "structs/str_802C39C.h" #include "code_803C1D0.h" #include "code_80958E8.h" @@ -17,10 +22,44 @@ typedef struct unkStruct_80E7F94 u8 *unk18; } unkStruct_80E7F94; -extern unkStruct_80E7F94 gUnknown_80E7F94[5]; +extern u8 sUnknown_80E8020[]; +extern u8 sUnknown_80E8038[]; +extern u8 sUnknown_80E8048[]; +extern u8 sUnknown_80E8060[]; +extern u8 sUnknown_80E8070[]; +extern u8 sUnknown_80E8088[]; + +const unkStruct_80E7F94 gUnknown_80E7F94[5] = { + + { + {0x5, MISSION_TYPE_FIND_ITEM, 0x4, DUNGEON_ODDITY_CAVE, 0xC, 0x123456, MONSTER_PIKACHU, MONSTER_CHIMECHO, ITEM_SITRUS_BERRY, ITEM1_EXTRA, ITEM_REVIVER_SEED, FRIEND_AREA_NONE}, + sUnknown_80E8088, + sUnknown_80E8070, + }, + { + {0x5, MISSION_TYPE_FIND_ITEM, 0x4, DUNGEON_REMAINS_ISLAND, 0x11, 0x123456,MONSTER_CHARMANDER, MONSTER_TREECKO, ITEM_SITRUS_BERRY, ITEM1_EXTRA, ITEM_REVIVER_SEED, FRIEND_AREA_NONE}, + sUnknown_80E8060, + sUnknown_80E8048, + }, + { + {0x5, MISSION_TYPE_FIND_ITEM, 0x4, DUNGEON_MARVELOUS_SEA, 0x11, 0x123456,MONSTER_BULBASAUR, MONSTER_TORCHIC, ITEM_SITRUS_BERRY, ITEM1_EXTRA, ITEM_REVIVER_SEED, FRIEND_AREA_NONE}, + sUnknown_80E8038, + sUnknown_80E8020, + }, + { + {0x5, MISSION_TYPE_FIND_ITEM, 0x0, DUNGEON_FANTASY_STRAIT, 0x1B, 0x123456, MONSTER_SQUIRTLE, MONSTER_CYNDAQUIL, ITEM_SITRUS_BERRY, ITEM1_EXTRA, ITEM_REVIVER_SEED, FRIEND_AREA_NONE}, + NULL, + NULL, + }, + { + {0x5, MISSION_TYPE_FIND_ITEM, 0x0, DUNGEON_SINISTER_WOODS, 0x9, 0x123456, MONSTER_CHIKORITA, MONSTER_TOTODILE, ITEM_SITRUS_BERRY, ITEM1_EXTRA, ITEM_REVIVER_SEED, FRIEND_AREA_NONE}, + NULL, + NULL, + }, +}; // TODO: unkStruct_803B344 isn't what we thought it is -unkStruct_80E7F94 *sub_803B344(s32 _r0) +const unkStruct_80E7F94 *sub_803B344(s32 _r0) { u32 r0 = (u8)_r0;