diff options
| author | yenatch <yenatch@gmail.com> | 2017-06-15 22:20:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-15 22:20:16 -0400 |
| commit | dda361afb7e2abafc15a498968580be6d1a83cfe (patch) | |
| tree | 46e7d19c2aec0e65ab446c7916e5d8aeb38bfe48 /data | |
| parent | c8213423cefc83310bc62ca8bcc17d7b6b42e442 (diff) | |
| parent | 0a779312c8a5911620ef43eaefbecdbac9fa7b33 (diff) | |
Merge pull request #326 from ProjectRevoTPP/master
move player_pc data to C file and restructure/label the file
Diffstat (limited to 'data')
| -rw-r--r-- | data/player_pc.s | 77 | ||||
| -rw-r--r-- | data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc | 2 | ||||
| -rw-r--r-- | data/scripts/maps/LittlerootTown_MaysHouse_2F.inc | 2 |
3 files changed, 2 insertions, 79 deletions
diff --git a/data/player_pc.s b/data/player_pc.s deleted file mode 100644 index 10f802bbb..000000000 --- a/data/player_pc.s +++ /dev/null @@ -1,77 +0,0 @@ - .include "asm/macros.inc" - .include "constants/constants.inc" - - .section .rodata - - .align 2 -gPCText_OptionDescList:: @ 8406288 - .4byte PCText_TakeOutItems - .4byte PCText_StoreItems - .4byte PCText_ThrowAwayItems - .4byte gMenuText_GoBackToPrev - - .align 2 -gPCText_PlayerPCOptionsText:: @ 8406298 - .4byte SecretBaseText_ItemStorage, PlayerPC_ItemStorage - .4byte gPCText_Mailbox, PlayerPC_Mailbox - .4byte SecretBaseText_Decoration, PlayerPC_Decoration - .4byte SecretBaseText_TurnOff, PlayerPC_TurnOff - -gBedroomPC_OptionOrder:: @ 84062B8 - .byte 0, 1, 2, 3 - -gPlayerPC_OptionOrder:: @ 84062BC - .byte 0, 1, 3 - - .align 2 -gPCText_ItemPCOptionsText:: @ 84062C0 - .4byte PCText_WithdrawItem, ItemStorage_Withdraw - .4byte PCText_DepositItem, ItemStorage_Deposit - .4byte PCText_TossItem, ItemStorage_Toss - .4byte gUnknownText_Exit, ItemStorage_Exit - - .align 2 -gUnknown_084062E0:: @ 84062E0 - .4byte ItemStorage_ResumeInputFromYesToss - .4byte ItemStorage_ResumeInputFromNoToss - - .align 2 -gUnknown_084062E8:: @ 84062E8 - .4byte sub_813B578 - .4byte sub_813B610 - - .align 2 -gNewGamePCItems:: @ 84062F0 - .2byte ITEM_POTION, 1 - .2byte ITEM_NONE, 0 - - .align 2 -gUnknown_084062F8:: @ 84062F8 - .4byte OtherText_Read, Mailbox_Read - .4byte gOtherText_MoveToBag, Mailbox_MoveToBag - .4byte OtherText_Give, Mailbox_Give - .4byte gOtherText_CancelNoTerminator, Mailbox_Cancel - -gUnknown_08406318:: @ 8406318 - .string "{STR_VAR_1}{CLEAR_TO 80}$" - -gUnknown_0840631E:: @ 840631E - .string "{COLOR RED}{STR_VAR_1}{CLEAR_TO 80}$" - -gUnknown_08406327:: @ 8406327 - .string "{STR_VAR_1}$" - -gUnknown_0840632A:: @ 840632A - .string "{COLOR RED}{STR_VAR_1}$" - -gUnknown_08406330:: @ 8406330 - .string "{CLEAR_TO 32}$" - - .align 1 -gUnknown_08406334:: @ 8406334 - .2byte 0x5294 - .2byte 0x6B5A - .2byte 0x7FFF - -gUnknown_0840633A:: @ 840633A - .string "{COLOR RED}{STR_VAR_1}$" diff --git a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc index 4f121118a..0c6ec79f7 100644 --- a/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_BrendansHouse_2F.inc @@ -67,7 +67,7 @@ LittlerootTown_BrendansHouse_2F_EventScript_152837:: @ 8152837 releaseall end -gUnknown_08152850:: @ 8152850 +gBrendanHouse_TurnPCOff:: @ 8152850 setvar 0x8004, 1 playsfx SE_PC_OFF special 215 diff --git a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc index 7871940ca..1aca3f86e 100644 --- a/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc +++ b/data/scripts/maps/LittlerootTown_MaysHouse_2F.inc @@ -215,7 +215,7 @@ LittlerootTown_MaysHouse_2F_EventScript_152C5C:: @ 8152C5C releaseall end -gUnknown_08152C75:: @ 8152C75 +gMayHouse_TurnPCOff:: @ 8152C75 setvar 0x8004, 2 playsfx SE_PC_OFF special 215 |