ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2025-01-13 07:03:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix naming conflicts

Browse Source
This commit is contained in:
PikalaxALT 2017-09-17 23:42:44 -04:00
parent 380858293e
commit 16f2e40576
5 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/global.berry.h
View File

@ -46,10 +46,6 @@ struct EnigmaBerry
u8 holdEffect; u8 holdEffect;
u8 holdEffectParam; u8 holdEffectParam;
u32 checksum; u32 checksum;
u8 pic[(6 * 6) * TILE_SIZE_4BPP];
u16 palette[16];
u8 description1[45];
u8 description2[45];
}; };
struct BattleEnigmaBerry struct BattleEnigmaBerry

2
ld_script.txt
View File

@ -207,7 +207,7 @@ SECTIONS {
asm/battle_controller_wally.o(.text); asm/battle_controller_wally.o(.text);
asm/player_pc.o(.text); asm/player_pc.o(.text);
asm/intro.o(.text); asm/intro.o(.text);
src/rom_81700F8.o(.text); src/reset_save_heap.o(.text);
asm/field_region_map.o(.text); asm/field_region_map.o(.text);
asm/battle_anim_8170478.o(.text); asm/battle_anim_8170478.o(.text);
asm/hall_of_fame.o(.text); asm/hall_of_fame.o(.text);

6
src/berry.c
View File

@ -807,7 +807,7 @@ const struct Berry gBerries[] =
// unused // unused
void ClearEnigmaBerries(void) void ClearEnigmaBerries(void)
{ {
CpuFill16(0, &gSaveBlock1Ptr->enigmaBerry, sizeof(gSaveBlock1Ptr->enigmaBerry)); CpuFill16(0, &gSaveBlock1Ptr->enigmaBerry, 52 /*FIXME: sizeof(gSaveBlock1Ptr->enigmaBerry)*/);
} }
void SetEnigmaBerry(u8 *src) void SetEnigmaBerry(u8 *src)
@ -815,7 +815,7 @@ void SetEnigmaBerry(u8 *src)
u32 i; u32 i;
u8 *dest = (u8*)&gSaveBlock1Ptr->enigmaBerry; u8 *dest = (u8*)&gSaveBlock1Ptr->enigmaBerry;
for (i = 0; i < sizeof(gSaveBlock1Ptr->enigmaBerry); i++) for (i = 0; i < 52 /*FIXME: sizeof(gSaveBlock1Ptr->enigmaBerry)*/; i++)
dest[i] = src[i]; dest[i] = src[i];
} }
@ -827,7 +827,7 @@ u32 GetEnigmaBerryChecksum(struct EnigmaBerry *enigmaBerry)
dest = (u8*)enigmaBerry; dest = (u8*)enigmaBerry;
checksum = 0; checksum = 0;
for (i = 0; i < sizeof(gSaveBlock1Ptr->enigmaBerry) - sizeof(gSaveBlock1Ptr->enigmaBerry.checksum); i++) for (i = 0; i < 52 /*FIXME: sizeof(gSaveBlock1Ptr->enigmaBerry)*/ - sizeof(gSaveBlock1Ptr->enigmaBerry.checksum); i++)
{ {
checksum += dest[i]; checksum += dest[i];
} }

4
src/load_save.c
View File

@ -6,15 +6,11 @@
#include "rng.h" #include "rng.h"
#include "malloc.h" #include "malloc.h"
extern u8 gPlayerPartyCount;
extern struct PokemonStorage* gPokemonStoragePtr;
extern void* gUnknown_0203CF5C; extern void* gUnknown_0203CF5C;
extern u8 gHeap[0x1C000];
extern bool16 IdentifyFlash(void); extern bool16 IdentifyFlash(void);
extern void SetBagItemsPointers(void); extern void SetBagItemsPointers(void);
extern void SetDecorationInventoriesPointers(void); extern void SetDecorationInventoriesPointers(void);
extern void InitHeap(void *heapStart, u32 heapSize);
void ApplyNewEncyprtionKeyToAllEncryptedData(u32 encryptionKey); void ApplyNewEncyprtionKeyToAllEncryptedData(u32 encryptionKey);

0
src/rom_81700F8.c → src/reset_save_heap.c
View File