diff options
Diffstat (limited to 'data')
| -rw-r--r-- | data/event_scripts.s | 2 | ||||
| -rw-r--r-- | data/player_pc.s | 28 | ||||
| -rw-r--r-- | data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc | 2 | ||||
| -rw-r--r-- | data/scripts/maps/LittlerootTown_MaysHouse_2F.inc | 2 | ||||
| -rw-r--r-- | data/specials.inc | 4 |
5 files changed, 19 insertions, 19 deletions
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 |