From 23c76bc334ed57fbeb51ef8f33ff6959983c6f2c Mon Sep 17 00:00:00 2001 From: Seth Barberee Date: Mon, 29 Jul 2024 16:34:42 -0700 Subject: [PATCH] add other define --- include/structs/str_dungeon.h | 1 + src/dungeon_util.c | 5 +++-- sym_ewram.txt | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/include/structs/str_dungeon.h b/include/structs/str_dungeon.h index 7ad24599a..1bc58090c 100644 --- a/include/structs/str_dungeon.h +++ b/include/structs/str_dungeon.h @@ -12,6 +12,7 @@ #define DUNGEON_MAX_SIZE_X 56 #define DUNGEON_MAX_SIZE_Y 32 #define DUNGEON_MAX_WILD_POKEMON 16 +#define DUNGEON_MAX_WILD_POKEMON_BODY_SIZE 16 #define DUNGEON_MAX_POKEMON MAX_TEAM_MEMBERS + DUNGEON_MAX_WILD_POKEMON #define DUNGEON_MAX_TRAPS 64 #define DUNGEON_MAX_ITEMS 64 diff --git a/src/dungeon_util.c b/src/dungeon_util.c index 322e020d3..6cf0495de 100644 --- a/src/dungeon_util.c +++ b/src/dungeon_util.c @@ -6,7 +6,8 @@ #include "structs/str_traps.h" extern u8 gUnknown_202EE70[MAX_TEAM_BODY_SIZE]; -extern u8 gUnknown_202EE76[0x10]; +extern u8 gUnknown_202EE76[DUNGEON_MAX_WILD_POKEMON_BODY_SIZE]; + u32 EntityGetStatusSprites(Entity *entity); void UpdateDungeonPokemonSprite(int id, short species, int status, char visible); @@ -95,7 +96,7 @@ void sub_804513C(void) gDungeon->wildPokemon[index]->type = ENTITY_NOTHING; } - for(index = 0; index < 0x10; index++) + for(index = 0; index < DUNGEON_MAX_WILD_POKEMON_BODY_SIZE; index++) { gUnknown_202EE76[index] = 0; } diff --git a/sym_ewram.txt b/sym_ewram.txt index 80a22002c..8c74477bd 100644 --- a/sym_ewram.txt +++ b/sym_ewram.txt @@ -348,7 +348,7 @@ gUnknown_202EE6C: /* 202EE6C (sub_8044F5C - sub_8067A80) */ gUnknown_202EE70: /* 202EE70 (sub_804513C - sub_80828E0) */ .space 0x6 gUnknown_202EE76: /* 202EE76 (sub_804513C - sub_8082A08) */ - .space 0x12 + .space 0x10 .include "src/dungeon_map_access.o"