diff options
| author | YamaArashi <shadow962@live.com> | 2016-10-27 00:01:41 -0700 |
|---|---|---|
| committer | YamaArashi <shadow962@live.com> | 2016-10-27 00:01:41 -0700 |
| commit | 241699e997817559ca21fa7b36f6fb35e58c2379 (patch) | |
| tree | d3b5e0ee67eb7f554d6497fc5d3910c23733f3fb /data | |
| parent | 7ae2909192e5a8ee8cc792460b1dacd55fb22921 (diff) | |
name functions
Diffstat (limited to 'data')
| -rw-r--r-- | data/data2.s | 26 | ||||
| -rw-r--r-- | data/specials.s | 10 |
2 files changed, 18 insertions, 18 deletions
diff --git a/data/data2.s b/data/data2.s index 354165f2c..a5a979625 100644 --- a/data/data2.s +++ b/data/data2.s @@ -1733,7 +1733,7 @@ gUnknown_081FAF5C:: @ 81FAF5C .4byte sub_80347B8 .4byte sub_8034910 .4byte sub_8034AE0 - .4byte c2_8123744 + .4byte sub_8034BFC .4byte sub_8034DC0 .4byte sub_8034F84 .4byte sub_8035030 @@ -27114,10 +27114,10 @@ gUnknown_08406288:: @ 8406288 .align 2 gUnknown_08406298:: @ 8406298 - .4byte SecretBaseText_ItemStorage, sub_8139E40 - .4byte gPCText_Mailbox, sub_8139E6C - .4byte SecretBaseText_Decoration, sub_8139ED8 - .4byte SecretBaseText_TurnOff, sub_8139EF8 + .4byte SecretBaseText_ItemStorage, PlayerPC_ItemStorage + .4byte gPCText_Mailbox, PlayerPC_Mailbox + .4byte SecretBaseText_Decoration, PlayerPC_Decoration + .4byte SecretBaseText_TurnOff, PlayerPC_TurnOff gUnknown_084062B8:: @ 84062B8 .incbin "baserom.gba", 0x004062b8, 0x4 @@ -27127,10 +27127,10 @@ gUnknown_084062BC:: @ 84062BC .align 2 gUnknown_084062C0:: @ 84062C0 - .4byte PCText_WithdrawItem, sub_813A118 - .4byte PCText_DepositItem, sub_813A0A0 - .4byte PCText_TossItem, sub_813A198 - .4byte gUnknownText_Exit, sub_813A21C + .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 @@ -27149,10 +27149,10 @@ gNewGamePCItems:: @ 84062F0 .align 2 gUnknown_084062F8:: @ 84062F8 - .4byte OtherText_Read, sub_813B428 - .4byte gOtherText_MoveToBag, sub_813B510 - .4byte OtherText_Give, sub_813B630 - .4byte gOtherText_CancelNoTerminator, sub_813B734 + .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}$" diff --git a/data/specials.s b/data/specials.s index 71715b2c6..b7ac9ad90 100644 --- a/data/specials.s +++ b/data/specials.s @@ -10,12 +10,12 @@ gSpecials:: .4byte sub_80BB63C .4byte sub_80BBAF0 .4byte sub_80BC440 - .4byte sub_80BC464 + .4byte SecretBasePC_PackUp .4byte sub_80BC114 .4byte sub_80BC56C .4byte sub_80BC5BC - .4byte sub_80BC604 - .4byte sub_80BC618 + .4byte SecretBasePC_Decoration + .4byte SecretBasePC_Registry .4byte sub_80BCE1C .4byte sub_80BCE90 .4byte sub_80BBDD0 @@ -249,8 +249,8 @@ gSpecials:: .4byte sub_813601C .4byte sub_810F404 .4byte ReducePlayerPartyToThree - .4byte sub_8139C74 - .4byte sub_8139CB4 + .4byte BedroomPC + .4byte PlayerPC .4byte FieldShowRegionMap .4byte sub_804D89C .4byte sub_804DB68 |