more stuff in ewram

This commit is contained in:
Seth Barberee 2024-08-14 12:04:37 -07:00
parent 41e88ad9bd
commit 4b1e714c2e
8 changed files with 28 additions and 37 deletions

6
include/ground_link.h Normal file
View File

@ -0,0 +1,6 @@
#ifndef GUARD_GROUND_LINK_H
#define GUARD_GROUND_LINK_H
void GroundLink_Select(s16 r0);
#endif // GUARD_GROUND_LINK_H

View File

@ -11,7 +11,7 @@
#include "code_80118A4.h"
#include "menu_input.h"
extern unkStruct_203B270 *gUnknown_203B270;
EWRAM_DATA_2 unkStruct_203B270 *gUnknown_203B270 = {0};
const UnkTextStruct2 gUnknown_80DC240 = {
0x00, 0x00, 0x00, 0x00,

View File

@ -19,7 +19,7 @@ struct unkStruct_203B274
unkStruct_808E218_arg unk8;
struct_Sub80095E4_2 s348;
};
extern struct unkStruct_203B274 *gUnknown_203B274;
EWRAM_DATA_2 struct unkStruct_203B274 *gUnknown_203B274 = {0};
extern u8 gAvailablePokemonNames[];

View File

@ -32,7 +32,7 @@ struct unkStruct_203B278
MenuInputStructSub unkC8;
};
extern struct unkStruct_203B278 *gUnknown_203B278;
EWRAM_DATA_2 struct unkStruct_203B278 *gUnknown_203B278 = {0};
static const UnkTextStruct2 sUnknown_80DC2F8 = {
0, 0, 0, 0,

View File

@ -1,6 +1,8 @@
#include "global.h"
#include "debug.h"
#include "ground_link.h"
#include "ground_script.h"
#include "ground_sprite.h"
#include "ground_map.h"
#include "dungeon.h"
#include "other_random.h"
@ -37,7 +39,6 @@ typedef struct GroundEffectData {
ScriptCommand *script;
} GroundEffectData;
void GroundSprite_Reset(s16);
void GroundMap_Select(s16);
void GroundMap_SelectDungeon(s16, DungeonLocation*, u8);
void GroundMap_ExecuteEnter(s16);
@ -47,7 +48,6 @@ void GroundMap_ExecuteStation(s32, s32, s32, bool8);
void GroundLives_ExecuteScript(s32, s16 *, ScriptInfoSmall *);
void GroundObject_ExecuteScript(s32, s16 *, ScriptInfoSmall *);
void GroundEffect_ExecuteScript(s32, s16 *, ScriptInfoSmall *);
void GroundLink_Select(s16);
void GroundLives_Select(s16, s32 group, s32 sector);
void GroundObject_Select(s16, s32 group, s32 sector);
void GroundEffect_Select(s16, s32 group, s32 sector);

View File

@ -1,3 +1,4 @@
#include "gba/defines.h"
#include "global.h"
#include "code_800558C.h"
#include "code_800DAC0.h"
@ -10,13 +11,16 @@
IWRAM_DATA unkStruct_3001B7C *gUnknown_3001B7C = {0};
extern unkStruct_2039DB0 gUnknown_2039DB0;
extern unkStruct_2039DB0 gUnknown_2039DC0;
extern u16 gUnknown_2039DCC;
extern u16 gUnknown_2039DCE;
extern u8 gUnknown_2039DD0;
extern u32 gUnknown_2039DD4;
extern OpenedFile *gUnknown_203B4B4;
EWRAM_DATA unkStruct_2039DB0 gUnknown_2039DB0 = {0};
EWRAM_DATA u32 sUnknown_2039DBC = {0}; // Unused, for alignment
EWRAM_DATA unkStruct_2039DB0 gUnknown_2039DC0 = {0};
EWRAM_DATA u16 gUnknown_2039DCC = {0};
EWRAM_DATA u16 gUnknown_2039DCE = {0};
EWRAM_DATA u8 gUnknown_2039DD0 = {0};
EWRAM_DATA u8 gUnknown_2039DD1[3] = {0, 0, 0}; // Unused, for alignment
EWRAM_DATA u32 gUnknown_2039DD4 = {0};
EWRAM_DATA_2 OpenedFile *gUnknown_203B4B4 = {0};
// dungeon_sbin.s
extern const struct FileArchive gDungeonFileArchive;

View File

@ -602,18 +602,8 @@ gUnknown_2039DA4: /* 2039DA4 (HandleAction) */
gUnknown_2039DA8: /* 2039DA8 (sub_80A14E8) */
.space 0x8
gUnknown_2039DB0: /* 2039DB0 (GroundSprite_Reset - sub_80A65F0) [unkStruct_2039DB0] */
.space 0x10
gUnknown_2039DC0: /* 2039DC0 (GroundSprite_Reset - sub_80A65F0) [unkStruct_2039DB0] */
.space 0xC
gUnknown_2039DCC: /* 2039DCC (GroundSprite_Reset - sub_80A73EC) */
.space 0x2
gUnknown_2039DCE: /* 2039DCE (GroundSprite_Reset - sub_80A73EC) */
.space 0x2
gUnknown_2039DD0: /* 2039DD0 (sub_80A62F0 - sub_80A69FC) */
.space 0x4
gUnknown_2039DD4: /* 2039DD4 (sub_80A62F0 - sub_80A69FC) */
.space 0x4
.include "src/ground_sprite.o"
gUnknown_2039DD8: /* 2039DD8 (sub_80A6E80 - sub_80A7310) */
.space 0x8

View File

@ -141,16 +141,9 @@ gUnknown_203B1FC: /* 203B1FC (sub_80151C0 - sub_8015F84) */
.include "src/hints_menu1.o"
.include "src/hints_menu2.o"
.include "src/gulpin_shop.o"
gUnknown_203B270: /* 203B270 (sub_801EE10 - sub_801F3F8) */
.space 0x4
gUnknown_203B274: /* 203B274 (sub_801F428 - sub_801F7E4) */
.space 0x4
gUnknown_203B278: /* 203B278 (sub_801F808 - sub_801FAD4) */
.space 0x4
.include "src/code_801EE10.o"
.include "src/code_801F428.o"
.include "src/code_801F808.o"
.include "src/gulpin_shop_801FB50.o"
.include "src/wigglytuff_shop1.o"
.include "src/wigglytuff_shop2.o"
@ -298,7 +291,5 @@ gUnknown_203B4AC: /* 203B4AC (ExecuteScriptCommand) */
gUnknown_203B4B0: /* 203B4B0 (sub_809D490 - HandleAction) */
.space 0x4
gUnknown_203B4B4: /* 203B4B4 (sub_80A62F0 - sub_80A658C) */
.space 0x4
.include "src/ground_sprite.o"
.include "src/ground_link.o"