move more data to src

This commit is contained in:
Seth Barberee 2024-12-08 17:22:41 -08:00
parent c7248641ee
commit ad0ec301b9
7 changed files with 11 additions and 26 deletions

View File

@ -1,23 +0,0 @@
.section .rodata
@ ???
.string "pksdir0\0"
.align 2,0
@ ???
.string "pksdir0\0"
.align 2,0
@ ???
.string "pksdir0\0"
.align 2,0
@ ???
.string "pksdir0\0"
.align 2,0
.global gUnknown_8109984
gUnknown_8109984: @ 8109984
.byte 0x00, 0x01, 0x02, 0x03, 0x04, 0x02, 0x01, 0x00
@ ???
.string "pksdir0\0"
.align 2,0

View File

@ -550,7 +550,10 @@ SECTIONS {
src/pokemon.o(.rodata);
data/data_81076E4.o(.rodata);
src/game_options.o(.rodata);
data/data_8109964.o(.rodata);
src/code_8094D28.o(.rodata);
src/play_time.o(.rodata);
src/code_8094F88.o(.rodata);
src/code_80958E8.o(.rodata);
src/code_80972F4.o(.rodata);
src/code_8097504.o(.rodata);
data/data_8109D10.o(.rodata);

View File

@ -1,4 +1,5 @@
#include "global.h"
#include "globaldata.h"
IWRAM_DATA u32 gUnknown_3001198[0x270] = {0};
EWRAM_DATA_2 s32 gUnknown_203B470 = {0};

View File

@ -1,4 +1,5 @@
#include "global.h"
#include "globaldata.h"
#include "code_8094D28.h"
#include "code_8094F88.h"
#include "constants/wonder_mail.h"

View File

@ -1,4 +1,5 @@
#include "global.h"
#include "globaldata.h"
#include "code_803C1D0.h"
#include "code_80958E8.h"
#include "code_80A26CC.h"
@ -38,7 +39,7 @@ extern void sub_803C45C(WonderMail *);
extern void sub_803C610(WonderMail *);
extern void sub_803C580(WonderMail *);
extern u8 gUnknown_8109984[];
static const u8 sPossibleMissionTypes[] = {MISSION_TYPE_FRIEND_RESCUE, MISSION_TYPE_FIND_ITEM, MISSION_TYPE_DELIVER_ITEM, MISSION_TYPE_RESCUE_CLIENT, MISSION_TYPE_RESCUE_TARGET, MISSION_TYPE_DELIVER_ITEM, MISSION_TYPE_FIND_ITEM, MISSION_TYPE_FRIEND_RESCUE};
static EWRAM_DATA unkStruct_203B490 sUnknown_2039448 = {0};
@ -187,7 +188,7 @@ bool8 GenerateMailJobInfo(struct WonderMail *mail)
}
mail->mailType = MAIL_TYPE_SUSPENDED_JOB;
rand = RandInt(8);
missionType = gUnknown_8109984[rand];
missionType = sPossibleMissionTypes[rand];
mail->missionType = missionType;
if (missionType == MISSION_TYPE_DELIVER_ITEM && GetRescueTeamRank() == 0) {
mail->missionType = MISSION_TYPE_FRIEND_RESCUE;

View File

@ -1,4 +1,5 @@
#include "global.h"
#include "globaldata.h"
#include "dungeon.h"
#include "exclusive_pokemon.h"
#include "event_flag.h"

View File

@ -1,4 +1,5 @@
#include "global.h"
#include "globaldata.h"
#include "play_time.h"
#include "code_8092334.h"