Game-Decompilation/pmd-red
1
0
Fork 0
mirror of https://github.com/pret/pmd-red.git synced 2024-11-23 13:09:56 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

kecleon_items to kecleon_bros (more descriptive)

Browse Source
This commit is contained in:
Kermalis 2023-08-05 11:11:22 -04:00
parent 8e2075af8f
commit 5919f5c74d
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -125,7 +125,7 @@ $(C_BUILDDIR)/agb_flash_mx.o: CC1FLAGS := -O -mthumb-interwork
$(C_BUILDDIR)/m4a.o: CC1 := tools/agbcc/bin/old_agbcc
# Stack size in sub_801A9E0 is funky with an unused var
$(C_BUILDDIR)/kecleon_items.o: CC1FLAGS := -mthumb-interwork -Wimplicit -Wparentheses -Werror -O2 -fhex-asm
$(C_BUILDDIR)/kecleon_bros.o: CC1FLAGS := -mthumb-interwork -Wimplicit -Wparentheses -Werror -O2 -fhex-asm
#### Main Rules ####

6
include/kecleon_items.h → include/kecleon_bros.h
View File

@ -1,5 +1,5 @@
#ifndef GUARD_KECLEON_ITEMS_H
#define GUARD_KECLEON_ITEMS_H
#ifndef GUARD_KECLEON_BROS_H
#define GUARD_KECLEON_BROS_H
#include "file_system.h"
#include "item.h"
@ -84,4 +84,4 @@ enum KecleonStoreStates
// mode corresponds to the enum: KecleonShopMode
u32 DisplayKeckleonDialogueSprite(u32 mode);
#endif // GUARD_KECLEON_ITEMS_H
#endif // GUARD_KECLEON_BROS_H

2
include/text.h
View File

@ -31,7 +31,7 @@ struct UnkTextStruct2_sub
{
// I haven't found a func that reads these separately yet, but simply making an arr[2] will cause assignments to break.
// Some funcs only match with this union for some reason even though they don't access the variables separately...
// The first func to break is currently sub_801A5D8 in kecleon_items_1.c
// The first func to break is currently sub_801A5D8 in kecleon_bros.c
// The first func I matched that uses the array is sub_8006554 in text_1.c (using the separated fields doesn't match or get even close)
union {
struct {

2
ld_script.txt
View File

@ -97,7 +97,7 @@ SECTIONS {
src/code_8012A18_1.o(.text);
src/felicity_bank.o(.text);
src/kangaskhan_storage.o(.text);
src/kecleon_items.o(.text);
src/kecleon_bros.o(.text);
src/code_801AFA4.o(.text);
src/code_801B3C0.o(.text);
src/code_801C620.o(.text);

2
src/kecleon_items.c → src/kecleon_bros.c
View File

@ -1,7 +1,7 @@
#include "global.h"
#include "code_800D090.h"
#include "constants/input.h"
#include "kecleon_items.h"
#include "kecleon_bros.h"
#include "memory.h"
#include "menu_input.h"
#include "pokemon.h"