ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-11-16 19:47:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Finish decompiling player_pc rodata

Browse Source
This commit is contained in:
KDSKardabox 2018-03-19 15:57:33 +05:30
parent a454bd98fa
commit a24ffb1321
14 changed files with 358 additions and 405 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
asm/party_menu.s
View File

@ -15442,7 +15442,7 @@ sub_81B8474: @ 81B8474
movs r0, 0 movs r0, 0
strb r0, [r1] strb r0, [r1]
ldr r2, =gSaveBlock1Ptr ldr r2, =gSaveBlock1Ptr
ldr r0, =gUnknown_0203BCB8 ldr r0, =playerPCItemPageInfo
ldrh r1, [r0] ldrh r1, [r0]
adds r1, 0x6 adds r1, 0x6
ldrh r0, [r0, 0x2] ldrh r0, [r0, 0x2]

75
data/player_pc.s
View File

@ -1,75 +0,0 @@
#include "constants/items.h"
.include "asm/macros.inc"
.include "constants/constants.inc"
.section .rodata
.align 2
gPCText_OptionDescList:: @ 85DFEA4
.4byte gText_TakeOutItemsFromPC
.4byte gText_StoreItemsInPC
.4byte gText_ThrowAwayItemsInPC
.4byte gText_GoBackPrevMenu
.align 2
sPlayerPCMenuActions:: @ 85DFEB4
.4byte gText_ItemStorage, PlayerPC_ItemStorage
.4byte gText_Mailbox, PlayerPC_Mailbox
.4byte gText_Decoration, PlayerPC_Decoration
.4byte gText_TurnOff, PlayerPC_TurnOff
.align 2
gBedroomPC_OptionOrder:: @ 85DFED4
.byte 0x00, 0x01, 0x02, 0x03
.align 2
gPlayerPC_OptionOrder:: @ 85DFED8
.byte 0x00, 0x01, 0x03, 0x00
.align 2
gPCText_ItemPCOptionsText:: @ 85DFEDC
.4byte gText_WithdrawItem, ItemStorage_Withdraw
.4byte gText_DepositItem, ItemStorage_Deposit
.4byte gText_TossItem, ItemStorage_Toss
.4byte gText_Cancel, ItemStorage_Exit
.align 2
gNewGamePCItems:: @ 85DFEFC
.2byte ITEM_POTION, 0x0001
.2byte 0x0000, 0x0000
.align 2
gMailboxMailOptions:: @ 85DFF04
.4byte gText_Read, Mailbox_DoMailRead
.4byte gText_MoveToBag, Mailbox_MoveToBag
.4byte gText_Give2, Mailbox_Give
.4byte gText_Cancel2, Mailbox_Cancel
.align 2
gUnknown_085DFF24:: @ 85DFF24
.4byte 0x09010100, 0x00010f06, 0x09010100, 0x00010f08, 0x0a010100, 0x00010f08
.align 2
gUnknown_085DFF3C:: @ 85DFF3C
.4byte sub_816CA94
.4byte sub_816CAC8
.align 2
gUnknown_085DFF44:: @ 85DFF44
.4byte 0x00000000, sub_816BDDC, fish4_goto_x5_or_x6, 0x00000000, 0x00080000, 0x07003129
.align 2
gUnknown_085DFF5C:: @ 85DFF5C
window_template 0x00, 0x10, 0x01, 0x0d, 0x12, 0x0f, 0x0001
window_template 0x00, 0x01, 0x0d, 0x0d, 0x06, 0x0f, 0x00eb
window_template 0x00, 0x01, 0x08, 0x03, 0x03, 0x0f, 0x0153
window_template 0x00, 0x01, 0x01, 0x0d, 0x02, 0x0f, 0x0139
window_template 0x00, 0x08, 0x09, 0x06, 0x02, 0x0f, 0x015c
.align 2
gUnknown_085DFF84:: @ 85DFF84
window_template 0x00, 0x09, 0x07, 0x05, 0x04, 0x0f, 0x0168
.align 2
gUnknown_085DFF8C:: @ 85DFF8C
.byte 0x01, 0x03, 0x02, 0x00

1
include/decoration.h
View File

@ -69,5 +69,6 @@ extern EWRAM_DATA u8 gCurDecorationIndex;
void sub_8126968(void); void sub_8126968(void);
void sub_8126AD8(u8 taskId); void sub_8126AD8(u8 taskId);
void sub_8127D38(u16 mapX, u16 mapY, u16 decor); void sub_8127D38(u16 mapX, u16 mapY, u16 decor);
void sub_8126B2C(u8 taskId);
#endif //GUARD_DECORATION_H #endif //GUARD_DECORATION_H

4
include/international_string_util.h
View File

@ -10,12 +10,12 @@ s32 GetStringRightAlignXOffset(s32 fontId, const u8 *str, s32 totalWidth);
s32 GetStringCenterAlignXOffsetWithLetterSpacing(s32 fontId, const u8 *str, s32 totalWidth, s32 letterSpacing); s32 GetStringCenterAlignXOffsetWithLetterSpacing(s32 fontId, const u8 *str, s32 totalWidth, s32 letterSpacing);
s32 GetStringWidthDifference(s32 fontId, const u8 *str, s32 totalWidth, s32 letterSpacing); s32 GetStringWidthDifference(s32 fontId, const u8 *str, s32 totalWidth, s32 letterSpacing);
s32 GetMaxWidthInMenuTable(const struct MenuAction *str, s32 arg1); s32 GetMaxWidthInMenuTable(const struct MenuAction *str, s32 arg1);
s32 sub_81DB3D8(const struct MenuAction *str, u8* arg1, s32 arg2); s32 sub_81DB3D8(const struct MenuAction *str, const u8* arg1, s32 arg2);
// sub_81DB41C // sub_81DB41C
// CopyMonCategoryText // CopyMonCategoryText
// sub_81DB494 // sub_81DB494
void PadNameString(u8 *dst, u8 padWith); void PadNameString(u8 *dst, u8 padWith);
// sub_81DB554 void sub_81DB554(u8 *, u8);
// sub_81DB5AC // sub_81DB5AC
u32 sub_81DB604(const u8 *); u32 sub_81DB604(const u8 *);
// sub_81DB620 // sub_81DB620

4
include/item.h
View File

@ -64,5 +64,9 @@ u16 BagGetItemIdByPocketPosition(u8 pocketId, u16 pocketPos);
void sub_80D6FB4(struct BagPocket*); void sub_80D6FB4(struct BagPocket*);
void sub_80D6F64(struct BagPocket*); void sub_80D6F64(struct BagPocket*);
void sub_80D702C(struct ItemSlot*, s16, u16); void sub_80D702C(struct ItemSlot*, s16, u16);
u8 sub_80D6CE4();
bool8 itemid_is_unique(u16 itemId);
void sub_80D6E48(u8, u16);
void sub_80D6E84(void);
#endif // ITEM_H #endif // ITEM_H

2
include/menu_helpers.h
View File

@ -14,7 +14,7 @@ struct YesNoFuncTable
// Exported RAM declarations // Exported RAM declarations
// Exported ROM declarations // Exported ROM declarations
void sub_812220C(struct ItemSlot *, u8, u8 *, u8 *, u8);
void sub_812225C(u16 *, u16 *, u8, u8); void sub_812225C(u16 *, u16 *, u8, u8);
void sub_8122298(u16 *, u16 *, u8, u8, u8); void sub_8122298(u16 *, u16 *, u8, u8, u8);
void sub_8121F68(u8 taskId, const struct YesNoFuncTable *data); void sub_8121F68(u8 taskId, const struct YesNoFuncTable *data);

1
include/party_menu.h
View File

@ -37,5 +37,6 @@ void display_pokemon_menu_message(u8 windowId);
void sub_81B1F18(u8 taskId, u8 pokemonIdx, s8 a, s16 hp, TaskFunc func); void sub_81B1F18(u8 taskId, u8 pokemonIdx, s8 a, s16 hp, TaskFunc func);
void sub_81B1B5C(void *a, u8 b); void sub_81B1B5C(void *a, u8 b);
u8 sub_81B1BD4(); u8 sub_81B1BD4();
void sub_81B8448();
#endif // GUARD_PARTY_MENU_H #endif // GUARD_PARTY_MENU_H

3
include/player_pc.h
View File

@ -72,14 +72,15 @@ struct PlayerPCItemPageStruct
u8 count; u8 count;
u8 filler[3]; u8 filler[3];
u8 scrollIndicatorId; u8 scrollIndicatorId;
u8 filler2[4];
}; };
// Exported type declarations // Exported type declarations
// Exported RAM declarations // Exported RAM declarations
extern struct PlayerPCItemPageStruct playerPCItemPageInfo;
// Exported ROM declarations // Exported ROM declarations
extern const struct MenuAction gMailboxMailOptions[];
void ReshowPlayerPC(u8 taskId); void ReshowPlayerPC(u8 taskId);
void sub_816B31C(void); void sub_816B31C(void);

8
include/pokenav.h
View File

@ -1,5 +1,6 @@
#ifndef GUARD_POKENAV_H #ifndef GUARD_POKENAV_H
#define GUARD_POKENAV_H #define GUARD_POKENAV_H
#include "player_pc.h"
bool8 sub_81D5C18(void); bool8 sub_81D5C18(void);
bool8 sub_81D20BC(void *arg0); bool8 sub_81D20BC(void *arg0);
@ -13,5 +14,12 @@ void sub_81D3480(void *arg0, u8 arg1);
void sub_81D2754(void *arg0, void *arg1); void sub_81D2754(void *arg0, void *arg1);
void sub_81D1F84(void *arg0, void *arg1, void *arg2); void sub_81D1F84(void *arg0, void *arg1, void *arg2);
const u8 *sub_81D62AC(void); const u8 *sub_81D62AC(void);
u8 sub_81D1C84(u8);
u8 sub_81D1DC0(struct PlayerPCItemPageStruct *);
void sub_81D1E90(struct PlayerPCItemPageStruct *);
void sub_81D1EC0(void);
void sub_81D1D04(u8);
bool8 sub_81D1C44(u8);
#endif //GUARD_POKENAV_H #endif //GUARD_POKENAV_H

39
include/strings.h
View File

@ -372,8 +372,45 @@ extern const u8 gBirchDexRatingText_LessThan190[];
extern const u8 gBirchDexRatingText_LessThan200[]; extern const u8 gBirchDexRatingText_LessThan200[];
extern const u8 gBirchDexRatingText_DexCompleted[]; extern const u8 gBirchDexRatingText_DexCompleted[];
//player menu text //player pc text
extern const u8 gText_WhatWouldYouLike[]; extern const u8 gText_WhatWouldYouLike[];
extern const u8 gText_NoMailHere[]; extern const u8 gText_NoMailHere[];
extern const u8 gText_TakeOutItemsFromPC[];
extern const u8 gText_StoreItemsInPC[];
extern const u8 gText_ThrowAwayItemsInPC[];
extern const u8 gText_GoBackPrevMenu[];
extern const u8 gText_ItemStorage[];
extern const u8 gText_Mailbox[];
extern const u8 gText_Decoration[];
extern const u8 gText_TurnOff[];
extern const u8 gText_WithdrawItem[];
extern const u8 gText_DepositItem[];
extern const u8 gText_TossItem[];
extern const u8 gText_Cancel[];
extern const u8 gText_Read[];
extern const u8 gText_MoveToBag[];
extern const u8 gText_Give2[];
extern const u8 gText_Cancel2[];
extern const u8 gText_NoItems[];
extern const u8 gText_WhatToDoWithVar1sMail[];
extern const u8 gText_MessageWillBeLost[];
extern const u8 gText_BagIsFull[];
extern const u8 gText_MailToBagMessageErased[];
extern const u8 gText_GoBackPrevMenu[];
extern const u8 gText_WithdrawHowManyItems[];
extern const u8 gText_WithdrawXItems[];
extern const u8 gText_TossHowManyVar1s[];
extern const u8 gText_ThrewAwayVar2Var1s[];
extern const u8 gText_NoRoomInBag[];
extern const u8 gText_TooImportantToToss[];
extern const u8 gText_ConfirmTossItems[];
extern const u8 gText_MoveVar1Where[];
#endif //GUARD_STRINGS_H #endif //GUARD_STRINGS_H

2
ld_script.txt
View File

@ -493,7 +493,7 @@ SECTIONS {
src/use_pokeblock.o(.rodata); src/use_pokeblock.o(.rodata);
data/use_pokeblock.o(.rodata); data/use_pokeblock.o(.rodata);
src/battle_controller_wally.o(.rodata); src/battle_controller_wally.o(.rodata);
data/player_pc.o(.rodata); src/player_pc.o(.rodata);
src/intro.o(.rodata); src/intro.o(.rodata);
src/field_region_map.o(.rodata); src/field_region_map.o(.rodata);
data/battle_anim_8170478.o(.rodata); data/battle_anim_8170478.o(.rodata);

2
src/international_string_util.c
View File

@ -42,7 +42,7 @@ s32 GetMaxWidthInMenuTable(const struct MenuAction *str, s32 arg1)
return convert_pixel_width_to_tile_width(var); return convert_pixel_width_to_tile_width(var);
} }
s32 sub_81DB3D8(const struct MenuAction *str, u8* arg1, s32 arg2) s32 sub_81DB3D8(const struct MenuAction *str, const u8* arg1, s32 arg2)
{ {
s32 i, var; s32 i, var;

607
src/player_pc.c
View File

File diff suppressed because it is too large Load Diff

13
sym_ewram.txt
View File

@ -806,19 +806,6 @@ gUnknown_0203BC8C: @ 203BC8C
.include "src/use_pokeblock.o" .include "src/use_pokeblock.o"
.include "src/player_pc.o" .include "src/player_pc.o"
gUnknown_0203BCB8: @ 203BCB8
.space 0x2
gUnknown_0203BCBA: @ 203BCBA
.space 0x2
gUnknown_0203BCBC: @ 203BCBC
.space 0x8
gUnknown_0203BCC4: @ 203BCC4
.space 0x4
.include "src/intro.o" .include "src/intro.o"
.include "src/field_region_map.o" .include "src/field_region_map.o"