Game-Decompilation/pokeheartgold
1
0
Fork 0
mirror of https://github.com/pret/pokeheartgold.git synced 2025-02-26 08:09:06 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Dressup to Fashion

Browse Source
This commit is contained in:
red031000 2023-06-23 19:56:27 +01:00
parent c079c317b8
commit 0c8b3f3926
No known key found for this signature in database
GPG Key ID: D27E50C050AE0CE1
17 changed files with 91 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
asm/include/overlay_02.inc
View File

@ -162,11 +162,11 @@
.public sub_0202AA44
.public sub_0202AA9C
.public sub_0202AAD4
.public SaveDressupData_GetFashionCase
.public Save_FashionData_GetFashionCase
.public sub_0202BA2C
.public sub_0202BA5C
.public sub_0202BB08
.public Save_DressupData_Get
.public Save_FashionData_Get
.public Roamers_GetRand
.public Save_Roamers_Get
.public RoamerSave_OutbreakActive

2
asm/include/overlay_40.inc
View File

@ -200,7 +200,7 @@
.public sub_0202BC10
.public sub_0202BE60
.public sub_0202BE98
.public Save_DressupData_Get
.public Save_FashionData_Get
.public GetIGTHours
.public GetIGTMinutes
.public GetIGTSeconds

2
asm/include/overlay_73.inc
View File

@ -145,7 +145,7 @@
.public sub_0202B994
.public sub_0202B9B8
.public sub_0202BF80
.public Save_DressupData_Get
.public Save_FashionData_Get
.public Save_FriendGroup_Get
.public sub_0202C8C4
.public sub_0202C8E4

4
asm/include/scrcmd_11.inc
View File

@ -22,10 +22,10 @@
.public PlayerProfile_GetTrainerGender
.public sub_020290E4
.public sub_020291D4
.public SaveDressupData_GetFashionCase
.public Save_FashionData_GetFashionCase
.public sub_0202BB08
.public sub_0202BBD8
.public Save_DressupData_Get
.public Save_FashionData_Get
.public Save_SealCase_Get
.public GiveOrTakeSeal
.public SealCase_CheckSealQuantity

8
asm/include/unk_0202B614.inc
View File

@ -10,12 +10,12 @@
.public CopyU16ArrayToString
.public CopyStringToU16Array
.public SaveArray_Get
.public Save_DressupData_Init
.public Save_DressupData_sizeof
.public Save_FashionData_Init
.public Save_FashionData_sizeof
.public sub_0202B994
.public sub_0202B998
.public sub_0202B9B8
.public SaveDressupData_GetFashionCase
.public Save_FashionData_GetFashionCase
.public sub_0202B9EC
.public sub_0202BA08
.public sub_0202BA2C
@ -50,7 +50,7 @@
.public sub_0202BF04
.public sub_0202BF08
.public sub_0202BF80
.public Save_DressupData_Get
.public Save_FashionData_Get
.public CreateMon
.public GetMonData
.public SetMonData

4
asm/include/unk_0203E348.inc
View File

@ -31,8 +31,8 @@
.public Save_Misc_RivalName_Set
.public Save_Mailbox_Get
.public sub_0202B9B8
.public SaveDressupData_GetFashionCase
.public Save_DressupData_Get
.public Save_FashionData_GetFashionCase
.public Save_FashionData_Get
.public sub_0202C08C
.public sub_0202C6F4
.public sub_0202C7F8

16
asm/overlay_02.s
View File

@ -22237,8 +22237,8 @@ _0225030A:
b _0225047E
_02250314:
ldr r0, [r4, #0xc]
bl Save_DressupData_Get
bl SaveDressupData_GetFashionCase
bl Save_FashionData_Get
bl Save_FashionData_GetFashionCase
add r7, r0, #0
mov r0, #0x12
lsl r0, r0, #4
@ -28111,8 +28111,8 @@ _02253114:
thumb_func_start ov02_02253134
ov02_02253134: ; 0x02253134
push {r3, r4, r5, r6, r7, lr}
bl Save_DressupData_Get
bl SaveDressupData_GetFashionCase
bl Save_FashionData_Get
bl Save_FashionData_GetFashionCase
ldr r6, _02253168 ; =ov02_02253D54
add r5, r0, #0
mov r4, #0
@ -28156,8 +28156,8 @@ _02253184: .word ov02_02253D54
thumb_func_start ov02_02253188
ov02_02253188: ; 0x02253188
push {r3, r4, r5, lr}
bl Save_DressupData_Get
bl SaveDressupData_GetFashionCase
bl Save_FashionData_Get
bl Save_FashionData_GetFashionCase
add r4, r0, #0
mov r5, #0
_02253196:
@ -28193,8 +28193,8 @@ _022531C0:
lsr r1, r1, #0x18
cmp r1, #0xe
blo _022531C0
bl Save_DressupData_Get
bl SaveDressupData_GetFashionCase
bl Save_FashionData_Get
bl Save_FashionData_GetFashionCase
add r6, r0, #0
mov r5, #0
add r7, sp, #0

4
asm/overlay_40.s
View File

@ -1275,7 +1275,7 @@ _0222C1AE:
bne _0222C200
add r1, #0x18
ldr r0, [r5, r1]
bl Save_DressupData_Get
bl Save_FashionData_Get
add r1, r4, #0
bl sub_0202B9B8
bl sub_0202BC10
@ -17574,7 +17574,7 @@ _0223434A:
mov r0, #0x83
lsl r0, r0, #4
ldr r0, [r5, r0]
bl Save_DressupData_Get
bl Save_FashionData_Get
mov r1, #0
bl sub_0202B9B8
mov r1, #0x8b

6
asm/overlay_73.s
View File

@ -9412,7 +9412,7 @@ ov73_021EA290: ; 0x021EA290
thumb_func_start ov73_021EA2A8
ov73_021EA2A8: ; 0x021EA2A8
push {r3, lr}
bl Save_DressupData_Get
bl Save_FashionData_Get
bl sub_0202B994
pop {r3, pc}
thumb_func_end ov73_021EA2A8
@ -9422,7 +9422,7 @@ ov73_021EA2B4: ; 0x021EA2B4
push {r4, r5, r6, lr}
add r4, r1, #0
add r5, r2, #0
bl Save_DressupData_Get
bl Save_FashionData_Get
add r6, r0, #0
add r0, r4, #0
add r1, r5, #0
@ -9444,7 +9444,7 @@ ov73_021EA2E0: ; 0x021EA2E0
push {r4, lr}
add r4, r0, #0
ldr r0, [r4, #4]
bl Save_DressupData_Get
bl Save_FashionData_Get
add r2, r0, #0
ldr r0, [r4, #8]
ldr r1, [r4, #0xc]

8
asm/scrcmd_11.s
View File

@ -1076,16 +1076,16 @@ _0204C5A2:
pop {r3, r4, r5, pc}
_0204C5B2:
ldr r0, [r5, #0xc]
bl Save_DressupData_Get
bl SaveDressupData_GetFashionCase
bl Save_FashionData_Get
bl Save_FashionData_GetFashionCase
add r1, r4, #0
mov r2, #1
bl sub_0202BB08
pop {r3, r4, r5, pc}
_0204C5C6:
ldr r0, [r5, #0xc]
bl Save_DressupData_Get
bl SaveDressupData_GetFashionCase
bl Save_FashionData_Get
bl Save_FashionData_GetFashionCase
add r1, r4, #0
bl sub_0202BBD8
pop {r3, r4, r5, pc}

24
asm/unk_0202B614.s
View File

@ -457,8 +457,8 @@ _0202B91A:
.balign 4, 0
thumb_func_end sub_0202B908
thumb_func_start Save_DressupData_Init
Save_DressupData_Init: ; 0x0202B930
thumb_func_start Save_FashionData_Init
Save_FashionData_Init: ; 0x0202B930
push {r3, r4, r5, r6, r7, lr}
mov r4, #0
ldr r6, _0202B980 ; =0x00001234
@ -502,15 +502,15 @@ _0202B95C:
_0202B980: .word 0x00001234
_0202B984: .word 0x000004FC
_0202B988: .word 0x000007F4
thumb_func_end Save_DressupData_Init
thumb_func_end Save_FashionData_Init
thumb_func_start Save_DressupData_sizeof
Save_DressupData_sizeof: ; 0x0202B98C
thumb_func_start Save_FashionData_sizeof
Save_FashionData_sizeof: ; 0x0202B98C
ldr r0, _0202B990 ; =0x00000834
bx lr
.balign 4, 0
_0202B990: .word 0x00000834
thumb_func_end Save_DressupData_sizeof
thumb_func_end Save_FashionData_sizeof
thumb_func_start sub_0202B994
sub_0202B994: ; 0x0202B994
@ -558,14 +558,14 @@ _0202B9DA:
.balign 4, 0
thumb_func_end sub_0202B9B8
thumb_func_start SaveDressupData_GetFashionCase
SaveDressupData_GetFashionCase: ; 0x0202B9E0
thumb_func_start Save_FashionData_GetFashionCase
Save_FashionData_GetFashionCase: ; 0x0202B9E0
ldr r1, _0202B9E8 ; =0x000007F4
add r0, r0, r1
bx lr
nop
_0202B9E8: .word 0x000007F4
thumb_func_end SaveDressupData_GetFashionCase
thumb_func_end Save_FashionData_GetFashionCase
thumb_func_start sub_0202B9EC
sub_0202B9EC: ; 0x0202B9EC
@ -1479,11 +1479,11 @@ _0202C022:
.balign 4, 0
thumb_func_end sub_0202BF80
thumb_func_start Save_DressupData_Get
Save_DressupData_Get: ; 0x0202C028
thumb_func_start Save_FashionData_Get
Save_FashionData_Get: ; 0x0202C028
ldr r3, _0202C030 ; =SaveArray_Get
mov r1, #0xc
bx r3
nop
_0202C030: .word SaveArray_Get
thumb_func_end Save_DressupData_Get
thumb_func_end Save_FashionData_Get

4
asm/unk_0203E348.s
View File

@ -1934,13 +1934,13 @@ sub_0203F0D0: ; 0x0203F0D0
bl GetPartyMonByIndex
str r0, [r5]
add r0, r6, #0
bl Save_DressupData_Get
bl Save_FashionData_Get
str r0, [sp]
mov r1, #0
bl sub_0202B9B8
add r4, r0, #0
ldr r0, [sp]
bl SaveDressupData_GetFashionCase
bl Save_FashionData_GetFashionCase
str r4, [r5, #4]
str r0, [r5, #8]
add r0, r6, #0

28
include/fashion_case.h
View File

@ -3,15 +3,15 @@
#include "mail_message.h"
typedef struct SaveDressupDataSub {
typedef struct SaveFashionDataSub {
u8 filler_00[0x40];
MAIL_MESSAGE mailMessage;
u8 filler_48[0x2C];
} SaveDressupDataSub; // size=0x74
} SaveFashionDataSub; // size=0x74
typedef struct SaveDressupDataSub3FC {
typedef struct SaveFashionDataSub3FC {
u8 filler_00[0x98];
} SaveDressupDataSub3FC; // size=0x98
} SaveFashionDataSub3FC; // size=0x98
typedef struct FashionCase {
u32 unk_00[40 / sizeof(u32)];
@ -19,20 +19,20 @@ typedef struct FashionCase {
u8 padding_3C[4];
} FashionCase;
typedef struct SaveDressupData { //todo: rename to SaveFashionData
SaveDressupDataSub unk_000[11]; // 000
SaveDressupDataSub3FC unk_3FC[5]; // 3FC
typedef struct SaveFashionData { //todo: rename to SaveFashionData
SaveFashionDataSub unk_000[11]; // 000
SaveFashionDataSub3FC unk_3FC[5]; // 3FC
FashionCase fashionCase; // 7F4
} SaveDressupData; // size=0x834
} SaveFashionData; // size=0x834
SaveDressupData *Save_DressupData_Get(SaveData *saveData);
FashionCase *SaveDressupData_GetFashionCase(SaveDressupData *unk);
SaveFashionData *Save_FashionData_Get(SaveData *saveData);
FashionCase *Save_FashionData_GetFashionCase(SaveFashionData *unk);
u32 FashionCase_CountAccessories(FashionCase *unksub);
u32 FashionCase_CountWallpapers(FashionCase *unksub);
BOOL sub_0202B9EC(SaveDressupData *dressupData, int a1);
BOOL sub_0202BA08(SaveDressupData *dressupData, int a1);
SaveDressupDataSub *sub_0202B9B8(SaveDressupData *dressupData, int a1);
void sub_0202BD7C(SaveDressupDataSub *dressupDataSub, int a1);
BOOL sub_0202B9EC(SaveFashionData *fashionData, int a1);
BOOL sub_0202BA08(SaveFashionData *fashionData, int a1);
SaveFashionDataSub *sub_0202B9B8(SaveFashionData *fashionData, int a1);
void sub_0202BD7C(SaveFashionDataSub *fashionDataSub, int a1);
void sub_0202BB08(FashionCase *a0, int a1, int a2);
int sub_0202BA2C(FashionCase *a0, int a1, int a2);
u32 sub_0202BA70(FashionCase *a0, int a1);

8
include/unk_0203E348.h
View File

@ -45,11 +45,11 @@ struct ChooseStarterAppArgs {
Pokemon starters[3];
};
typedef struct DressupPokemonAppData {
SaveDressupData *saveDressupData;
typedef struct FashionAppData {
SaveFashionData *saveFashionData;
int unk_4;
int unk_8;
} DressupPokemonAppData;
} FashionAppData;
struct UnkStruct_ScrCmd408 {
SaveData *saveData;
@ -110,7 +110,7 @@ void *sub_0203E7F4(HeapID heapId, FieldSystem *fsys, u8 a2, u16 a3);
u32 *sub_0203ED80(FieldSystem *fsys, u32 a1, u16 *a2);
void *sub_0203FB94(HeapID heapId, FieldSystem *fsys, u16 a2, u16 a3);
void sub_0203F198(TaskManager *taskManager, u16 *ret_p, SaveData *saveData, u16 a3, u16 a4);
void sub_0203F204(FieldSystem *fsys, DressupPokemonAppData *dressupData);
void sub_0203F204(FieldSystem *fsys, FashionAppData *fashionData);
void sub_0203F0A8(FieldSystem *fsys, struct UnkStruct_ScrCmd408 *unk);
void sub_0203E868(FieldSystem *fsys, PCBoxAppData *pcBoxData);
void sub_0203F4A8(TaskManager *taskManager);

4
src/bag_view.c
View File

@ -92,11 +92,11 @@ static u32 GetNumSeals(SaveData *saveData) {
}
static u32 GetNumFashionAccessories(SaveData *saveData) {
return FashionCase_CountAccessories(SaveDressupData_GetFashionCase(Save_DressupData_Get(saveData)));
return FashionCase_CountAccessories(Save_FashionData_GetFashionCase(Save_FashionData_Get(saveData)));
}
static u32 GetNumFashionBackgrounds(SaveData *saveData) {
return FashionCase_CountWallpapers(SaveDressupData_GetFashionCase(Save_DressupData_Get(saveData)));
return FashionCase_CountWallpapers(Save_FashionData_GetFashionCase(Save_FashionData_Get(saveData)));
}
static u32 GetNumBattlePoints(SaveData *saveData) {

6
src/save_arrays.c
View File

@ -31,7 +31,7 @@
#define DECL_CHUNK_EX(sizefn, initfn) extern u32 sizefn(void); extern void initfn(void *);
DECL_CHUNK_EX(sub_020290B8, sub_020290C8)
DECL_CHUNK(Save_DressupData)
DECL_CHUNK(Save_FashionData)
DECL_CHUNK(GameStats)
DECL_CHUNK_EX(sub_02031000, sub_02031008)
DECL_CHUNK_EX(sub_0202DB40, sub_0202DB44)
@ -110,8 +110,8 @@ const struct SaveChunkHeader gSaveChunkHeaders[] = {
}, {
SAVE_DRESSUP_DATA,
0,
(SAVESIZEFN)Save_DressupData_sizeof,
(SAVEINITFN)Save_DressupData_Init
(SAVESIZEFN)Save_FashionData_sizeof,
(SAVEINITFN)Save_FashionData_Init
}, {
SAVE_MAILBOX,
0,

50
src/scrcmd_c.c
View File

@ -1789,31 +1789,31 @@ BOOL ScrCmd_436(ScriptContext *ctx) {
}
static BOOL sub_02042A30(FieldSystem *fsys, int a1, int a2) {
SaveDressupData *dressupData = Save_DressupData_Get(fsys->savedata);
SaveFashionData *fashionData = Save_FashionData_Get(fsys->savedata);
if (a1 == 0) {
if (!sub_0202B9EC(dressupData, a2)) {
if (!sub_0202B9EC(fashionData, a2)) {
return FALSE;
}
} else {
if (!sub_0202BA08(dressupData, a2)) {
if (!sub_0202BA08(fashionData, a2)) {
return FALSE;
}
}
return TRUE;
}
static DressupPokemonAppData *sub_02042A60(HeapID heapId, FieldSystem *fsys, int a2, int a3) {
SaveDressupData *saveDressupData = Save_DressupData_Get(fsys->savedata);
DressupPokemonAppData *dressupAppData;
static FashionAppData *sub_02042A60(HeapID heapId, FieldSystem *fsys, int a2, int a3) {
SaveFashionData *saveFashionData = Save_FashionData_Get(fsys->savedata);
FashionAppData *fashionAppData;
if (!sub_02042A30(fsys, a2, a3)) {
return NULL;
}
dressupAppData = AllocFromHeap(heapId, sizeof(DressupPokemonAppData));
memset(dressupAppData, 0, sizeof(DressupPokemonAppData));
dressupAppData->saveDressupData = saveDressupData;
dressupAppData->unk_8 = a2;
dressupAppData->unk_4 = a3;
return dressupAppData;
fashionAppData = AllocFromHeap(heapId, sizeof(FashionAppData));
memset(fashionAppData, 0, sizeof(FashionAppData));
fashionAppData->saveFashionData = saveFashionData;
fashionAppData->unk_8 = a2;
fashionAppData->unk_4 = a3;
return fashionAppData;
}
BOOL ScrCmd_151(ScriptContext *ctx) {
@ -1827,7 +1827,7 @@ BOOL ScrCmd_152(ScriptContext *ctx) {
}
BOOL ScrCmd_153(ScriptContext *ctx) {
struct DressupPokemonAppData **p_data = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA);
struct FashionAppData **p_data = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA);
u16 *p_dest = ScriptGetVarPointer(ctx);
*p_dest = (*p_data)->unk_4;
FreeToHeap(*p_data);
@ -1908,16 +1908,16 @@ BOOL ScrCmd_154(ScriptContext *ctx) {
}
BOOL ScrCmd_155(ScriptContext *ctx) {
struct DressupPokemonAppData **dressupAppData = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA);
struct FashionAppData **fashionAppData = FieldSysGetAttrAddr(ctx->fsys, SCRIPTENV_RUNNING_APP_DATA);
u16 r7 = ScriptReadHalfword(ctx);
u16 *r6 = ScriptGetVarPointer(ctx);
*dressupAppData = sub_02042A60(HEAP_ID_FIELD, ctx->fsys, 0, r7);
if (*dressupAppData == NULL) {
*fashionAppData = sub_02042A60(HEAP_ID_FIELD, ctx->fsys, 0, r7);
if (*fashionAppData == NULL) {
*r6 = 1;
return TRUE;
} else {
*r6 = 0;
sub_0203F204(ctx->fsys, *dressupAppData);
sub_0203F204(ctx->fsys, *fashionAppData);
SetupNativeScript(ctx, ScrNative_WaitApplication_DestroyTaskData);
return TRUE;
}
@ -1937,7 +1937,7 @@ BOOL ScrCmd_255(ScriptContext *ctx) {
BOOL ScrCmd_256(ScriptContext *ctx) {
u16 r4 = ScriptGetVar(ctx);
sub_0202BD7C(sub_0202B9B8(Save_DressupData_Get(ctx->fsys->savedata), 0), r4);
sub_0202BD7C(sub_0202B9B8(Save_FashionData_Get(ctx->fsys->savedata), 0), r4);
return TRUE;
}
@ -3258,7 +3258,7 @@ BOOL ScrCmd_381(ScriptContext *ctx) {
BOOL ScrCmd_403(ScriptContext *ctx) {
u16 r4 = ScriptGetVar(ctx);
u16 r6 = ScriptGetVar(ctx);
sub_0202BB08(SaveDressupData_GetFashionCase(Save_DressupData_Get(ctx->fsys->savedata)), r4, r6);
sub_0202BB08(Save_FashionData_GetFashionCase(Save_FashionData_Get(ctx->fsys->savedata)), r4, r6);
return FALSE;
}
@ -3266,7 +3266,7 @@ BOOL ScrCmd_404(ScriptContext *ctx) {
u16 r4 = ScriptGetVar(ctx);
u16 r6 = ScriptGetVar(ctx);
u16 *p_ret = ScriptGetVarPointer(ctx);
*p_ret = sub_0202BA2C(SaveDressupData_GetFashionCase(Save_DressupData_Get(ctx->fsys->savedata)), r4, r6);
*p_ret = sub_0202BA2C(Save_FashionData_GetFashionCase(Save_FashionData_Get(ctx->fsys->savedata)), r4, r6);
return FALSE;
}
@ -3274,20 +3274,20 @@ BOOL ScrCmd_405(ScriptContext *ctx) {
u16 r7 = ScriptGetVar(ctx);
u16 r6 = ScriptGetVar(ctx);
u16 *p_ret = ScriptGetVarPointer(ctx);
*p_ret = r6 <= sub_0202BA70(SaveDressupData_GetFashionCase(Save_DressupData_Get(ctx->fsys->savedata)), r7);
*p_ret = r6 <= sub_0202BA70(Save_FashionData_GetFashionCase(Save_FashionData_Get(ctx->fsys->savedata)), r7);
return FALSE;
}
BOOL ScrCmd_406(ScriptContext *ctx) {
u16 r4 = ScriptGetVar(ctx);
sub_0202BBD8(SaveDressupData_GetFashionCase(Save_DressupData_Get(ctx->fsys->savedata)), r4);
sub_0202BBD8(Save_FashionData_GetFashionCase(Save_FashionData_Get(ctx->fsys->savedata)), r4);
return FALSE;
}
BOOL ScrCmd_407(ScriptContext *ctx) {
u16 r6 = ScriptGetVar(ctx);
u16 *p_ret = ScriptGetVarPointer(ctx);
*p_ret = sub_0202BA5C(SaveDressupData_GetFashionCase(Save_DressupData_Get(ctx->fsys->savedata)), r6);
*p_ret = sub_0202BA5C(Save_FashionData_GetFashionCase(Save_FashionData_Get(ctx->fsys->savedata)), r6);
return FALSE;
}
@ -3786,7 +3786,7 @@ BOOL ScrCmd_525(ScriptContext *ctx) {
BOOL ScrCmd_526(ScriptContext *ctx) {
u16 *p_ret = ScriptGetVarPointer(ctx);
FashionCase *fashionCase = SaveDressupData_GetFashionCase(Save_DressupData_Get(ctx->fsys->savedata));
FashionCase *fashionCase = Save_FashionData_GetFashionCase(Save_FashionData_Get(ctx->fsys->savedata));
int i, k, n = 0;
u16 sp4[16];
@ -3852,7 +3852,7 @@ BOOL ScrCmd_534(ScriptContext *ctx) {
BOOL ScrCmd_536(ScriptContext *ctx) {
u16 r4 = ScriptGetVar(ctx);
u16 r6 = ScriptGetVar(ctx);
sub_0202BB7C(SaveDressupData_GetFashionCase(Save_DressupData_Get(ctx->fsys->savedata)), r4, r6);
sub_0202BB7C(Save_FashionData_GetFashionCase(Save_FashionData_Get(ctx->fsys->savedata)), r4, r6);
return FALSE;
}