pret/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2026-10-01 07:20:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #415 from DizzyEggg/code_80A26CC

Browse Source 
code_80A26CC_1.s
This commit is contained in:
AnonymousRandomPerson
2025-06-06 18:02:59 -04:00
committed by GitHub
parent 5f5c8bdccf bf077a679a
commit 178f4e95dc
40 changed files with 1917 additions and 4570 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code_802DB28.c
+1 -3
View File
@@ -75,9 +75,7 @@ void sub_802DC00(void)
if (sUnknown_203B2FC != NULL) {
if (sUnknown_203B2FC->monPortrait.faceFile != NULL)
CloseFile(sUnknown_203B2FC->monPortrait.faceFile);
MemoryFree(sUnknown_203B2FC);
sUnknown_203B2FC = NULL;
FREE_AND_SET_NULL(sUnknown_203B2FC);
}
}
src/code_809A560.c
+3 -13
View File
@@ -315,11 +315,7 @@ void sub_809A83C(s16 param_1)
temp->monPortrait.spriteId = 0;
strcpy(gFormatBuffer_Monsters[param_1], sInvalidText);
strcpy(gFormatBuffer_Names[param_1], sInvalidText);
if(temp->faceFile)
{
CloseFile(temp->faceFile);
temp->faceFile = NULL;
}
TRY_CLOSE_FILE_AND_SET_NULL(temp->faceFile);
}
bool8 sub_809A8B8(s32 param_1, s32 param_2)
@@ -332,10 +328,7 @@ bool8 sub_809A8B8(s32 param_1, s32 param_2)
u8 uVar9 = 1;
u8 byte1 = 0;
if (unkPtr->faceFile != NULL) {
CloseFile(unkPtr->faceFile);
unkPtr->faceFile = NULL;
}
TRY_CLOSE_FILE_AND_SET_NULL(unkPtr->faceFile);
sub_80A7DDC(&local_28,&local_26);
if (local_28 >= 10 && local_28 <= 29) {
@@ -509,10 +502,7 @@ bool8 sub_809AC7C(s32 a0_, s32 a1_, s32 a2_)
u8 a2 = (u8) a2_;
struct unkStruct_3001B64_sub *unkPtr = &gUnknown_3001B64->unk43C[a0];
if (unkPtr->faceFile != NULL) {
CloseFile(unkPtr->faceFile);
unkPtr->faceFile = NULL;
}
TRY_CLOSE_FILE_AND_SET_NULL(unkPtr->faceFile);
if (unkPtr->speciesID >= 0 && r5 != -1 && unkPtr->speciesID != 0) {
if (a2 != 0x15) {
src/code_80A26CC.c
+1
View File
@@ -462,3 +462,4 @@ UNUSED static const u8 *sub_80A2B28(u16 r0)
{
return sub_80A2B18(GetScriptVarValue(NULL, GROUND_PLACE));
}
src/dungeon_misc.c
+1 -4
View File
@@ -224,10 +224,7 @@ void CloseAllSpriteFiles(void)
s32 i;
for (i = 0; i < MONSTER_MAX; i++) {
if (gDungeon->sprites[i] != NULL) {
CloseFile(gDungeon->sprites[i]);
gDungeon->sprites[i] = NULL;
}
TRY_CLOSE_FILE_AND_SET_NULL(gDungeon->sprites[i]);
}
}
src/felicity_bank.c
+1 -2
View File
@@ -116,8 +116,7 @@ void DestroyFelicityBank(void)
{
if (sFelicityBankWork != NULL) {
CloseFile(sFelicityBankWork->monPortrait.faceFile);
MemoryFree(sFelicityBankWork);
sFelicityBankWork = NULL;
FREE_AND_SET_NULL(sFelicityBankWork);
}
}
src/ground_bg.c
+1457
View File
File diff suppressed because it is too large Load Diff
src/ground_map.c
+5 -5
View File
@@ -1,6 +1,7 @@
#include "global.h"
#include "debug.h"
#include "event_flag.h"
#include "ground_bg.h"
#include "ground_main.h"
#include "ground_map.h"
#include "ground_map_2.h"
@@ -8,7 +9,7 @@
#include "memory.h"
IWRAM_INIT GroundMapAction *gGroundMapAction = {NULL};
IWRAM_INIT unkStruct_3001B70 *gGroundMapDungeon_3001B70 = {NULL};
IWRAM_INIT GroundBg *gGroundMapDungeon_3001B70 = {NULL};
extern GroundMapAction *gGroundMapAction;
@@ -31,9 +32,8 @@ extern bool8 GroundScriptNotify(void *, s32);
extern const CallbackData gGroundScriptNullCallbacks;
extern const DebugLocation gUnknown_8117538[];
extern void sub_80A2D00(unkStruct_3001B70 *);
extern void sub_80A2D68(unkStruct_3001B70 *);
extern void sub_80A2D88(unkStruct_3001B70 *);
extern void sub_80A2D68(GroundBg *);
extern void sub_80A2D88(GroundBg *);
void AllocGroundMapAction(void)
{
@@ -60,7 +60,7 @@ void GroundMap_Reset(void)
ActionResetScriptData((Action *)gGroundMapAction, gUnknown_8117538);
if (gGroundMapDungeon_3001B70 != NULL) {
sub_80A2D00(gGroundMapDungeon_3001B70);
GroundBg_FreeAll(gGroundMapDungeon_3001B70);
MemoryFree(gGroundMapDungeon_3001B70);
gGroundMapDungeon_3001B70 = NULL;
}
src/ground_map_1.c
+6 -5
View File
@@ -1,4 +1,5 @@
#include "global.h"
#include "ground_bg.h"
#include "ground_map.h"
#include "ground_map_2.h"
#include "ground_script.h"
@@ -9,8 +10,8 @@ extern DebugLocation gUnknown_8117770;
extern s16 HandleAction(Action *action, DebugLocation *debug);
extern void sub_80A4740(void *, s32, s32 *, u32);
extern u32 sub_80A4720(void *, s32, s32 *);
extern u8 sub_80A46C0(unkStruct_3001B70 *, u32, s32, s32);
extern u8 sub_80A4660(unkStruct_3001B70 *, u32, s32, s32);
extern u8 sub_80A46C0(GroundBg *, u32, s32, s32);
extern u8 sub_80A4660(GroundBg *, u32, s32, s32);
u8 sub_80A5934(s32 param_1, s32 param_2, s32 param_3)
{
@@ -42,9 +43,9 @@ void GroundMap_Action(void)
}
extern u8 sub_809D248(PixelPos *r0);
extern void sub_80A4580(unkStruct_3001B70 *, u32, PixelPos *);
extern void sub_80A456C(unkStruct_3001B70 *, u32, const PixelPos *);
extern void sub_80A4764(unkStruct_3001B70 *);
extern void sub_80A4580(GroundBg *, u32, PixelPos *);
extern void sub_80A456C(GroundBg *, u32, const PixelPos *);
extern void sub_80A4764(GroundBg *);
extern GroundMapAction *gGroundMapAction;
src/ground_map_2.c
+12 -13
View File
@@ -2,27 +2,26 @@
#include "code_800558C.h"
#include "debug.h"
#include "event_flag.h"
#include "ground_bg.h"
#include "ground_map.h"
#include "ground_map_2.h"
#include "memory.h"
IWRAM_INIT unkStruct_3001B74 *gUnknown_3001B74 = {NULL};
IWRAM_INIT unkStruct_3001B70 *gUnknown_3001B78 = {NULL};
IWRAM_INIT GroundBg *gUnknown_3001B78 = {NULL};
extern const u8 gUnknown_8117784[];
extern const SubStruct_52C gUnknown_8117784;
extern const s16 gUnknown_811E5F4[][2];
extern const u8 gGroundWeatherSelect[];
extern const s32 gUnknown_81177BC[];
extern void sub_80A3BB0(unkStruct_3001B70 *, u32);
extern void sub_80A2D00(unkStruct_3001B70 *);
extern void sub_80A2B40(unkStruct_3001B70 *, const u8 *);
extern void sub_80A2FBC(unkStruct_3001B70 *, u32);
extern void sub_80A49E8(unkStruct_3001B70 *);
extern void sub_80A456C(unkStruct_3001B70 *, u32, const s32 *);
extern void sub_80A4580(unkStruct_3001B70 *, u32, s32 *);
extern void sub_80A3BB0(GroundBg *, u32);
extern void sub_80A2FBC(GroundBg *, u32);
extern void sub_80A49E8(GroundBg *);
extern void sub_80A456C(GroundBg *, u32, const s32 *);
extern void sub_80A4580(GroundBg *, u32, s32 *);
extern void sub_80A56C0(s32 *);
extern void sub_80A4764(unkStruct_3001B70 *);
extern void sub_80A4764(GroundBg *);
static void sub_80A62D0(void);
@@ -56,14 +55,14 @@ void sub_80A5EDC(u8 param_1)
gUnknown_3001B74->unk2 = param_1;
if (gUnknown_3001B78 != NULL) {
sub_80A2D00(gUnknown_3001B78);
GroundBg_FreeAll(gUnknown_3001B78);
MemoryFree(gUnknown_3001B78);
gUnknown_3001B78 = NULL;
}
if (param_1) {
gUnknown_3001B78 = MemoryAlloc(sizeof(unkStruct_3001B70), 6);
sub_80A2B40(gUnknown_3001B78, gUnknown_8117784);
gUnknown_3001B78 = MemoryAlloc(sizeof(GroundBg), 6);
GroundBg_Init(gUnknown_3001B78, &gUnknown_8117784);
sub_80A2FBC(gUnknown_3001B78, -1);
}
}
src/gulpin_shop.c
+1 -2
View File
@@ -95,8 +95,7 @@ void DestroyGulpinShop(void)
{
if (sGulpinShopWork != NULL) {
CloseFile(sGulpinShopWork->monPortrait.faceFile);
MemoryFree(sGulpinShopWork);
sGulpinShopWork = NULL;
FREE_AND_SET_NULL(sGulpinShopWork);
}
}
src/gulpin_shop_801FB50.c
+1 -2
View File
@@ -178,8 +178,7 @@ void sub_801FD7C(void)
{
if (gUnknown_203B27C) {
CloseFile(gUnknown_203B27C->monPortrait.faceFile);
MemoryFree(gUnknown_203B27C);
gUnknown_203B27C = NULL;
FREE_AND_SET_NULL(gUnknown_203B27C);
}
}
src/kangaskhan_storage1.c
+1 -2
View File
@@ -130,8 +130,7 @@ void DeleteKangaskhanStorage(void)
{
if (gKangaskhanStorageWork != NULL) {
CloseFile(gKangaskhanStorageWork->monPortrait.faceFile);
MemoryFree(gKangaskhanStorageWork);
gKangaskhanStorageWork = NULL;
FREE_AND_SET_NULL(gKangaskhanStorageWork);
}
}
src/kecleon_bros1.c
+1 -2
View File
@@ -232,8 +232,7 @@ void DeleteKecleonBros(void)
{
if (sKecleonBrosWork1 != NULL) {
CloseFile(sKecleonBrosWork1->monPortrait.faceFile);
MemoryFree(sKecleonBrosWork1);
sKecleonBrosWork1 = NULL;
FREE_AND_SET_NULL(sKecleonBrosWork1);
}
}
src/luminous_cave.c
+1 -2
View File
@@ -164,8 +164,7 @@ void CleanLuminousCave(void)
{
if (sLuminousCaveWork != NULL) {
CloseFile(sLuminousCaveWork->unk104);
MemoryFree(sLuminousCaveWork);
sLuminousCaveWork = NULL;
FREE_AND_SET_NULL(sLuminousCaveWork);
}
}
src/makuhita_dojo1.c
+1 -2
View File
@@ -136,8 +136,7 @@ void MakuhitaDojo_Delete(void)
{
if (sMakuhitaDojoWork1 != NULL) {
CloseFile(sMakuhitaDojoWork1->monPortrait.faceFile);
MemoryFree(sMakuhitaDojoWork1);
sMakuhitaDojoWork1 = NULL;
FREE_AND_SET_NULL(sMakuhitaDojoWork1);
}
}
src/memory.c
+1 -1
View File
@@ -149,7 +149,7 @@ UNUSED static void MemoryCopy16(u16 *dest, u16 *src, s32 size)
}
}
void MemoryCopy32(u32 *dest, u32 *src, s32 size)
void MemoryCopy32(u32 *dest, const u32 *src, s32 size)
{
while (size > 0) {
size -= 4;
src/mission_reward.c
+2 -4
View File
@@ -158,12 +158,10 @@ u32 sub_802F298(void)
void sub_802F2C0(void)
{
if(gUnknown_203B310 != NULL)
{
if (gUnknown_203B310 != NULL) {
if(gUnknown_203B310->monPortrait.faceFile != 0)
CloseFile(gUnknown_203B310->monPortrait.faceFile);
MemoryFree(gUnknown_203B310);
gUnknown_203B310 = NULL;
FREE_AND_SET_NULL(gUnknown_203B310);
}
}
src/post_office_guide1.c
+1 -2
View File
@@ -112,8 +112,7 @@ void CleanHelperPelipper(void)
if (sPostOfficeHelper != NULL) {
if (sPostOfficeHelper->monPortrait.faceFile != NULL)
CloseFile(sPostOfficeHelper->monPortrait.faceFile);
MemoryFree(sPostOfficeHelper);
sPostOfficeHelper = NULL;
FREE_AND_SET_NULL(sPostOfficeHelper);
}
}
src/save_write.c
+1 -2
View File
@@ -131,8 +131,7 @@ void FinishWriteSavePak(void)
if (sSavePakWrite != NULL) {
if (sSavePakWrite->monPortrait.faceFile != NULL)
CloseFile(sSavePakWrite->monPortrait.faceFile);
MemoryFree(sSavePakWrite);
sSavePakWrite = NULL;
FREE_AND_SET_NULL(sSavePakWrite);
}
sub_80993E4();
}
src/thank_you_wonder_mail.c
+2 -4
View File
@@ -406,11 +406,9 @@ u32 ThankYouMailPelipperCallback(void)
void CleanThankYouMailPelipper(void)
{
if(sUnknown_203B2C4 != NULL)
{
if (sUnknown_203B2C4 != NULL) {
CloseFile(sUnknown_203B2C4->monPortrait.faceFile);
MemoryFree(sUnknown_203B2C4);
sUnknown_203B2C4 = NULL;
FREE_AND_SET_NULL(sUnknown_203B2C4);
sub_8030DE4();
FreeItemDescriptionWindow();
sub_803084C();
src/unk_dungeon_load_maybe.c
+2 -1
View File
@@ -1,5 +1,6 @@
#include "global.h"
#include "globaldata.h"
#include "unk_dungeon_load.h"
#include "memory.h"
#include "dungeon.h"
#include "decompress_at.h"
@@ -15,7 +16,7 @@ extern const u8 gUnknown_8108EC0[];
static s32 sub_80ADFB8(s32 a0, s32 a1, s32 a2, s32 a3, u16 *a4, s32 a5, u8 *a6, s32 a7);
// This function is called when loading a transition between a dungeon and its summit, where the player can continue, save, or go back.
void sub_80ADD9C(OpenedFile **a0, OpenedFile **a1, u32 *a2, u32 *a3, u16 *a4, DungeonLocation *a5, s32 a6, s32 a7, s32 a8, u16 *a9)
void sub_80ADD9C(OpenedFile **a0, OpenedFile **a1, u32 *a2, void *a3, u16 *a4, DungeonLocation *a5, s32 a6, s32 a7, s32 a8, u16 *a9, s32 unused)
{
OpenedFile *file;
s32 r8;
src/wigglytuff_shop3.c
+1 -2
View File
@@ -124,8 +124,7 @@ void CleanWigglytuffShop(void)
{
if (sWigglytuffShop3Work) {
CloseFile(sWigglytuffShop3Work->monPortrait.faceFile);
MemoryFree(sWigglytuffShop3Work);
sWigglytuffShop3Work = NULL;
FREE_AND_SET_NULL(sWigglytuffShop3Work);
}
}
src/wonder_mail.c
+1 -2
View File
@@ -399,8 +399,7 @@ void sub_80282FC(void)
{
if (sUnknown_203B2C0 != NULL) {
CloseFile(sUnknown_203B2C0->monPortrait.faceFile);
MemoryFree(sUnknown_203B2C0);
sUnknown_203B2C0 = NULL;
FREE_AND_SET_NULL(sUnknown_203B2C0);
sub_8031E10();
FriendList_Free();
sub_803084C();
src/wonder_mail_2.c
+2 -4
View File
@@ -128,11 +128,9 @@ u32 sub_802B358(void)
void sub_802B3B8(void)
{
if(sUnknown_203B2C8 != NULL)
{
if (sUnknown_203B2C8 != NULL) {
CloseFile(sUnknown_203B2C8->monPortrait.faceFile);
MemoryFree(sUnknown_203B2C8);
sUnknown_203B2C8 = NULL;
FREE_AND_SET_NULL(sUnknown_203B2C8);
}
}
src/wonder_mail_6.c
+1 -2
View File
@@ -166,8 +166,7 @@ void sub_80310B4(void)
sub_803084C();
if (gUnknown_203B328 != NULL) {
CloseFile(gUnknown_203B328->monPortrait.faceFile);
MemoryFree(gUnknown_203B328);
gUnknown_203B328 = NULL;
FREE_AND_SET_NULL(gUnknown_203B328);
}
}