Merge pull request #231 from KDSKardabox/master

Player PC

5 files changed, 5 insertions, 80 deletions

diff --git a/data/event_scripts.s b/data/event_scripts.s
index 22c44bee3..1343a4fa9 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
deleted file mode 100644
index 47bdbff39..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
-gUnknown_085DFEA4:: @ 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
-
-	.align 2
-gUnknown_085DFED4:: @ 85DFED4
-	.byte 0x00, 0x01, 0x02, 0x03
-
-	.align 2
-gUnknown_085DFED8:: @ 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
-
-	.align 2
-gUnknown_085DFEFC:: @ 85DFEFC
-	.2byte ITEM_POTION, 0x0001
-	.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
-
-	.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
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 8b83702ad..ab1a441ff 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