From e7cf8e5c1713c624b7b9db7a58c6c812e90ec7a9 Mon Sep 17 00:00:00 2001 From: KDSKardabox Date: Mon, 12 Mar 2018 13:56:20 +0530 Subject: Start decompile player_pc --- data/event_scripts.s | 2 +- data/player_pc.s | 28 +++++++++++----------- .../maps/LittlerootTown_BrendansHouse_2F.inc | 2 +- data/scripts/maps/LittlerootTown_MaysHouse_2F.inc | 2 +- data/specials.inc | 4 ++-- 5 files changed, 19 insertions(+), 19 deletions(-) (limited to 'data') diff --git a/data/event_scripts.s b/data/event_scripts.s index 42c5aa1ad..44705269c 100644 --- a/data/event_scripts.s +++ b/data/event_scripts.s @@ -1788,7 +1788,7 @@ EventScript_271DBC:: @ 8271DBC EventScript_271DF9:: @ 8271DF9 playse SE_PC_LOGIN msgbox gUnknown_082726C2, 4 - special sub_816AE98 + special PlayerPC waitstate goto EventScript_271DAC end diff --git a/data/player_pc.s b/data/player_pc.s index 47bdbff39..ef8a2ba9c 100644 --- a/data/player_pc.s +++ b/data/player_pc.s @@ -5,36 +5,36 @@ .section .rodata .align 2 -gUnknown_085DFEA4:: @ 85DFEA4 +gPCText_OptionDescList:: @ 85DFEA4 .4byte gText_TakeOutItemsFromPC .4byte gText_StoreItemsInPC .4byte gText_ThrowAwayItemsInPC .4byte gText_GoBackPrevMenu .align 2 -gUnknown_085DFEB4:: @ 85DFEB4 - .4byte gText_ItemStorage, task_pc_itemstorage - .4byte gText_Mailbox, sub_816B0A8 - .4byte gText_Decoration, sub_816B138 - .4byte gText_TurnOff, sub_816B148 +sPlayerPCMenuActions:: @ 85DFEB4 + .4byte gText_ItemStorage, PlayerPC_ItemStorage + .4byte gText_Mailbox, PlayerPC_Mailbox + .4byte gText_Decoration, PlayerPC_Decoration + .4byte gText_TurnOff, PlayerPC_TurnOff .align 2 -gUnknown_085DFED4:: @ 85DFED4 +gBedroomPC_OptionOrder:: @ 85DFED4 .byte 0x00, 0x01, 0x02, 0x03 .align 2 -gUnknown_085DFED8:: @ 85DFED8 +gPlayerPC_OptionOrder:: @ 85DFED8 .byte 0x00, 0x01, 0x03, 0x00 .align 2 -gUnknown_085DFEDC:: @ 85DFEDC - .4byte gText_WithdrawItem, sub_816B398 - .4byte gText_DepositItem, sub_816B2C8 - .4byte gText_TossItem, sub_816B3E4 - .4byte gText_Cancel, sub_816B4A4 +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 -gUnknown_085DFEFC:: @ 85DFEFC +gNewGamePCItems:: @ 85DFEFC .2byte ITEM_POTION, 0x0001 .2byte 0x0000, 0x0000 diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index 0e7ecbf22..a5223d38a 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -259,7 +259,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_1F8626:: @ 81F8626 special DoPCTurnOnEffect playse SE_PC_ON msgbox gUnknown_08272D87, 4 - special sub_816AE58 + special BedroomPC waitstate releaseall end diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index 327112d2f..f300b5849 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -320,7 +320,7 @@ LittlerootTown_MaysHouse_2F_EventScript_1F9576:: @ 81F9576 special DoPCTurnOnEffect playse SE_PC_ON msgbox gUnknown_08272D87, 4 - special sub_816AE58 + special BedroomPC waitstate releaseall end diff --git a/data/specials.inc b/data/specials.inc index 62dd9717e..df85fb140 100644 --- a/data/specials.inc +++ b/data/specials.inc @@ -260,8 +260,8 @@ gSpecials:: @ 81DBA64 def_special ValidateEReaderTrainer def_special sub_8139228 def_special sub_80F94E8 - def_special sub_816AE58 - def_special sub_816AE98 + def_special BedroomPC + def_special PlayerPC def_special FieldShowRegionMap def_special sub_807E73C def_special sub_807EA10 -- cgit v1.2.3 From f3b5ed0d121126ee05ab33700c0de40a0da77966 Mon Sep 17 00:00:00 2001 From: KDSKardabox Date: Tue, 13 Mar 2018 14:41:39 +0530 Subject: Decompile more functions & rename some labels --- data/player_pc.s | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'data') diff --git a/data/player_pc.s b/data/player_pc.s index ef8a2ba9c..69eacb69b 100644 --- a/data/player_pc.s +++ b/data/player_pc.s @@ -39,11 +39,11 @@ gNewGamePCItems:: @ 85DFEFC .2byte 0x0000, 0x0000 .align 2 -gUnknown_085DFF04:: @ 85DFF04 - .4byte gText_Read, sub_816B878 - .4byte gText_MoveToBag, sub_816B994 - .4byte gText_Give2, sub_816BABC - .4byte gText_Cancel2, sub_816BBD4 +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 -- cgit v1.2.3 From a24ffb13213b7cd8761cd501bc4c052da66f57c4 Mon Sep 17 00:00:00 2001 From: KDSKardabox Date: Mon, 19 Mar 2018 15:57:33 +0530 Subject: Finish decompiling player_pc rodata --- data/player_pc.s | 75 -------------------------------------------------------- 1 file changed, 75 deletions(-) delete mode 100644 data/player_pc.s (limited to 'data') diff --git a/data/player_pc.s b/data/player_pc.s deleted file mode 100644 index 69eacb69b..000000000 --- a/data/player_pc.s +++ /dev/null @@ -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 -- cgit v1.2.3