diff options
| -rw-r--r-- | asm/battle_setup.s | 2 | ||||
| -rw-r--r-- | asm/decoration.s | 38 | ||||
| -rw-r--r-- | asm/item_use.s | 2 | ||||
| -rw-r--r-- | asm/player_pc.s | 166 | ||||
| -rw-r--r-- | asm/rom3.s | 6 | ||||
| -rw-r--r-- | asm/rom4.s | 18 | ||||
| -rw-r--r-- | asm/secret_base.s | 28 | ||||
| -rw-r--r-- | data/data2.s | 26 | ||||
| -rw-r--r-- | data/specials.s | 10 | ||||
| -rw-r--r-- | src/wild_encounter.c | 14 |
10 files changed, 155 insertions, 155 deletions
diff --git a/asm/battle_setup.s b/asm/battle_setup.s index 42292e775..3f78709b0 100644 --- a/asm/battle_setup.s +++ b/asm/battle_setup.s @@ -594,7 +594,7 @@ _08081E4C: b _08081E86 _08081E50: adds r0, r4, 0 - bl sub_8057434 + bl MetatileBehavior_IsBridge lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 diff --git a/asm/decoration.s b/asm/decoration.s index 08b25c0db..ba4517877 100644 --- a/asm/decoration.s +++ b/asm/decoration.s @@ -54,8 +54,8 @@ sub_80FE220: @ 80FE220 _080FE238: .4byte gUnknown_020388D4 thumb_func_end sub_80FE220 - thumb_func_start sub_80FE23C -sub_80FE23C: @ 80FE23C + thumb_func_start DecorationPC +DecorationPC: @ 80FE23C push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -73,15 +73,15 @@ sub_80FE23C: @ 80FE23C bx r0 .align 2, 0 _080FE25C: .4byte gTasks -_080FE260: .4byte sub_80FE2EC - thumb_func_end sub_80FE23C +_080FE260: .4byte Task_DecorationPCProcessMenuInput + thumb_func_end DecorationPC - thumb_func_start sub_80FE264 -sub_80FE264: @ 80FE264 + thumb_func_start Task_SecretBasePC_Decoration +Task_SecretBasePC_Decoration: @ 80FE264 push {lr} lsls r0, 24 lsrs r0, 24 - bl sub_80FE23C + bl DecorationPC ldr r1, _080FE284 @ =0x0201f000 ldr r0, _080FE288 @ =gSaveBlock1 + 0x1A1A str r0, [r1] @@ -96,14 +96,14 @@ sub_80FE264: @ 80FE264 .align 2, 0 _080FE284: .4byte 0x0201f000 _080FE288: .4byte gSaveBlock1 + 0x1A1A - thumb_func_end sub_80FE264 + thumb_func_end Task_SecretBasePC_Decoration - thumb_func_start sub_80FE28C -sub_80FE28C: @ 80FE28C + thumb_func_start DoPlayerPCDecoration +DoPlayerPCDecoration: @ 80FE28C push {lr} lsls r0, 24 lsrs r0, 24 - bl sub_80FE23C + bl DecorationPC ldr r1, _080FE2AC @ =0x0201f000 ldr r0, _080FE2B0 @ =gSaveBlock1 + 0x2688 str r0, [r1] @@ -118,7 +118,7 @@ sub_80FE28C: @ 80FE28C .align 2, 0 _080FE2AC: .4byte 0x0201f000 _080FE2B0: .4byte gSaveBlock1 + 0x2688 - thumb_func_end sub_80FE28C + thumb_func_end DoPlayerPCDecoration thumb_func_start sub_80FE2B4 sub_80FE2B4: @ 80FE2B4 @@ -148,8 +148,8 @@ sub_80FE2B4: @ 80FE2B4 _080FE2E8: .4byte gUnknown_083EC654 thumb_func_end sub_80FE2B4 - thumb_func_start sub_80FE2EC -sub_80FE2EC: @ 80FE2EC + thumb_func_start Task_DecorationPCProcessMenuInput +Task_DecorationPCProcessMenuInput: @ 80FE2EC push {r4-r7,lr} lsls r0, 24 lsrs r6, r0, 24 @@ -224,7 +224,7 @@ _080FE38C: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_80FE2EC + thumb_func_end Task_DecorationPCProcessMenuInput thumb_func_start sub_80FE394 sub_80FE394: @ 80FE394 @@ -282,7 +282,7 @@ _080FE404: .4byte 0x0201f000 _080FE408: .4byte gUnknown_0815F399 _080FE40C: adds r0, r4, 0 - bl sub_8139E24 + bl ReshowPlayerPC _080FE412: pop {r4} pop {r0} @@ -331,7 +331,7 @@ sub_80FE428: @ 80FE428 .align 2, 0 _080FE464: .4byte gUnknown_020388D4 _080FE468: .4byte gTasks -_080FE46C: .4byte sub_80FE2EC +_080FE46C: .4byte Task_DecorationPCProcessMenuInput thumb_func_end sub_80FE428 thumb_func_start sub_80FE470 @@ -716,7 +716,7 @@ sub_80FE758: @ 80FE758 b _080FE7A2 .align 2, 0 _080FE794: .4byte gTasks -_080FE798: .4byte sub_80FE2EC +_080FE798: .4byte Task_DecorationPCProcessMenuInput _080FE79C: adds r0, r4, 0 bl sub_80B3068 @@ -6807,7 +6807,7 @@ _08101668: bx r0 .align 2, 0 _08101670: .4byte gTasks -_08101674: .4byte sub_80FE2EC +_08101674: .4byte Task_DecorationPCProcessMenuInput thumb_func_end sub_8101648 thumb_func_start sub_8101678 diff --git a/asm/item_use.s b/asm/item_use.s index 713323866..3b2e27b46 100644 --- a/asm/item_use.s +++ b/asm/item_use.s @@ -483,7 +483,7 @@ _080C933C: _080C935C: lsls r0, r6, 24 lsrs r0, 24 - bl sub_8057434 + bl MetatileBehavior_IsBridge lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 diff --git a/asm/player_pc.s b/asm/player_pc.s index 6b84e4fc2..83b706fe3 100644 --- a/asm/player_pc.s +++ b/asm/player_pc.s @@ -54,8 +54,8 @@ _08139C6C: .4byte gSaveBlock1 + 0x498 _08139C70: .4byte gNewGamePCItems thumb_func_end NewGameInitPCItems - thumb_func_start sub_8139C74 -sub_8139C74: @ 8139C74 + thumb_func_start BedroomPC +BedroomPC: @ 8139C74 push {lr} ldr r1, _08139C9C @ =gUnknown_02039314 ldr r0, _08139CA0 @ =gUnknown_084062B8 @@ -80,11 +80,11 @@ _08139CA0: .4byte gUnknown_084062B8 _08139CA4: .4byte gUnknown_030007B4 _08139CA8: .4byte TaskDummy _08139CAC: .4byte gOtherText_WhatWillYouDo -_08139CB0: .4byte sub_8139CF4 - thumb_func_end sub_8139C74 +_08139CB0: .4byte InitPlayerPCMenu + thumb_func_end BedroomPC - thumb_func_start sub_8139CB4 -sub_8139CB4: @ 8139CB4 + thumb_func_start PlayerPC +PlayerPC: @ 8139CB4 push {lr} ldr r1, _08139CDC @ =gUnknown_02039314 ldr r0, _08139CE0 @ =gUnknown_084062BC @@ -109,11 +109,11 @@ _08139CE0: .4byte gUnknown_084062BC _08139CE4: .4byte gUnknown_030007B4 _08139CE8: .4byte TaskDummy _08139CEC: .4byte gOtherText_WhatWillYouDo -_08139CF0: .4byte sub_8139CF4 - thumb_func_end sub_8139CB4 +_08139CF0: .4byte InitPlayerPCMenu + thumb_func_end PlayerPC - thumb_func_start sub_8139CF4 -sub_8139CF4: @ 8139CF4 + thumb_func_start InitPlayerPCMenu +InitPlayerPCMenu: @ 8139CF4 push {r4,r5,lr} sub sp, 0x8 adds r4, r0, 0 @@ -162,11 +162,11 @@ _08139D50: .4byte gUnknown_030007B4 _08139D54: .4byte gUnknown_08406298 _08139D58: .4byte gUnknown_02039314 _08139D5C: .4byte gTasks -_08139D60: .4byte sub_8139D64 - thumb_func_end sub_8139CF4 +_08139D60: .4byte PlayerPCProcessMenuInput + thumb_func_end InitPlayerPCMenu - thumb_func_start sub_8139D64 -sub_8139D64: @ 8139D64 + thumb_func_start PlayerPCProcessMenuInput +PlayerPCProcessMenuInput: @ 8139D64 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -252,10 +252,10 @@ _08139E10: _08139E18: .4byte gUnknown_08406298 _08139E1C: .4byte gUnknown_030007B4 _08139E20: .4byte gUnknown_02039314 - thumb_func_end sub_8139D64 + thumb_func_end PlayerPCProcessMenuInput - thumb_func_start sub_8139E24 -sub_8139E24: @ 8139E24 + thumb_func_start ReshowPlayerPC +ReshowPlayerPC: @ 8139E24 push {lr} lsls r0, 24 lsrs r0, 24 @@ -267,17 +267,17 @@ sub_8139E24: @ 8139E24 bx r0 .align 2, 0 _08139E38: .4byte gOtherText_WhatWillYouDo -_08139E3C: .4byte sub_8139CF4 - thumb_func_end sub_8139E24 +_08139E3C: .4byte InitPlayerPCMenu + thumb_func_end ReshowPlayerPC - thumb_func_start sub_8139E40 -sub_8139E40: @ 8139E40 + thumb_func_start PlayerPC_ItemStorage +PlayerPC_ItemStorage: @ 8139E40 push {r4,lr} adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 movs r0, 0 - bl sub_8139F58 + bl InitItemStorageMenu ldr r1, _08139E64 @ =gTasks lsls r0, r4, 2 adds r0, r4 @@ -290,11 +290,11 @@ sub_8139E40: @ 8139E40 bx r0 .align 2, 0 _08139E64: .4byte gTasks -_08139E68: .4byte sub_8139FD4 - thumb_func_end sub_8139E40 +_08139E68: .4byte ItemStorageMenuProcessInput + thumb_func_end PlayerPC_ItemStorage - thumb_func_start sub_8139E6C -sub_8139E6C: @ 8139E6C + thumb_func_start PlayerPC_Mailbox +PlayerPC_Mailbox: @ 8139E6C push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -319,7 +319,7 @@ sub_8139E6C: @ 8139E6C .align 2, 0 _08139E9C: .4byte 0x0201fe00 _08139EA0: .4byte gOtherText_NoMailHere -_08139EA4: .4byte sub_8139E24 +_08139EA4: .4byte ReshowPlayerPC _08139EA8: strb r2, [r1] strb r2, [r1, 0x2] @@ -342,10 +342,10 @@ _08139ECA: .align 2, 0 _08139ED0: .4byte gTasks _08139ED4: .4byte sub_813B174 - thumb_func_end sub_8139E6C + thumb_func_end PlayerPC_Mailbox - thumb_func_start sub_8139ED8 -sub_8139ED8: @ 8139ED8 + thumb_func_start PlayerPC_Decoration +PlayerPC_Decoration: @ 8139ED8 push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -356,14 +356,14 @@ sub_8139ED8: @ 8139ED8 movs r3, 0x9 bl MenuZeroFillWindowRect adds r0, r4, 0 - bl sub_80FE28C + bl DoPlayerPCDecoration pop {r4} pop {r0} bx r0 - thumb_func_end sub_8139ED8 + thumb_func_end PlayerPC_Decoration - thumb_func_start sub_8139EF8 -sub_8139EF8: @ 8139EF8 + thumb_func_start PlayerPC_TurnOff +PlayerPC_TurnOff: @ 8139EF8 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -406,10 +406,10 @@ _08139F4C: pop {r4} pop {r0} bx r0 - thumb_func_end sub_8139EF8 + thumb_func_end PlayerPC_TurnOff - thumb_func_start sub_8139F58 -sub_8139F58: @ 8139F58 + thumb_func_start InitItemStorageMenu +InitItemStorageMenu: @ 8139F58 push {r4,lr} sub sp, 0x8 adds r4, r0, 0 @@ -442,7 +442,7 @@ sub_8139F58: @ 8139F58 lsls r4, 2 adds r4, r0 ldr r0, [r4] - bl sub_8139FB4 + bl ItemStorageMenuPrint add sp, 0x8 pop {r4} pop {r0} @@ -450,10 +450,10 @@ sub_8139F58: @ 8139F58 .align 2, 0 _08139FAC: .4byte gUnknown_084062C0 _08139FB0: .4byte gUnknown_08406288 - thumb_func_end sub_8139F58 + thumb_func_end InitItemStorageMenu - thumb_func_start sub_8139FB4 -sub_8139FB4: @ 8139FB4 + thumb_func_start ItemStorageMenuPrint +ItemStorageMenuPrint: @ 8139FB4 push {r4,lr} adds r4, r0, 0 movs r0, 0x2 @@ -468,10 +468,10 @@ sub_8139FB4: @ 8139FB4 pop {r4} pop {r0} bx r0 - thumb_func_end sub_8139FB4 + thumb_func_end ItemStorageMenuPrint - thumb_func_start sub_8139FD4 -sub_8139FD4: @ 8139FD4 + thumb_func_start ItemStorageMenuProcessInput +ItemStorageMenuProcessInput: @ 8139FD4 push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -505,7 +505,7 @@ _0813A008: lsrs r0, 22 adds r0, r4 ldr r0, [r0] - bl sub_8139FB4 + bl ItemStorageMenuPrint b _0813A06C .align 2, 0 _0813A020: .4byte gUnknown_08406288 @@ -547,10 +547,10 @@ _0813A06C: bx r0 .align 2, 0 _0813A074: .4byte gUnknown_084062C0 - thumb_func_end sub_8139FD4 + thumb_func_end ItemStorageMenuProcessInput - thumb_func_start sub_813A078 -sub_813A078: @ 813A078 + thumb_func_start Task_ItemStorage_Deposit +Task_ItemStorage_Deposit: @ 813A078 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -569,10 +569,10 @@ _0813A094: bx r0 .align 2, 0 _0813A09C: .4byte gPaletteFade - thumb_func_end sub_813A078 + thumb_func_end Task_ItemStorage_Deposit - thumb_func_start sub_813A0A0 -sub_813A0A0: @ 813A0A0 + thumb_func_start ItemStorage_Deposit +ItemStorage_Deposit: @ 813A0A0 push {lr} lsls r0, 24 lsrs r0, 24 @@ -590,8 +590,8 @@ sub_813A0A0: @ 813A0A0 bx r0 .align 2, 0 _0813A0C0: .4byte gTasks -_0813A0C4: .4byte sub_813A078 - thumb_func_end sub_813A0A0 +_0813A0C4: .4byte Task_ItemStorage_Deposit + thumb_func_end ItemStorage_Deposit thumb_func_start sub_813A0C8 sub_813A0C8: @ 813A0C8 @@ -616,7 +616,7 @@ _0813A0E8: bx r0 .align 2, 0 _0813A0F0: .4byte gTasks -_0813A0F4: .4byte sub_8139FD4 +_0813A0F4: .4byte ItemStorageMenuProcessInput thumb_func_end sub_813A0C8 thumb_func_start sub_813A0F8 @@ -624,7 +624,7 @@ sub_813A0F8: @ 813A0F8 push {lr} bl MenuDisplayMessageBox movs r0, 0x1 - bl sub_8139F58 + bl InitItemStorageMenu ldr r0, _0813A114 @ =sub_813A0C8 movs r1, 0 bl CreateTask @@ -635,8 +635,8 @@ sub_813A0F8: @ 813A0F8 _0813A114: .4byte sub_813A0C8 thumb_func_end sub_813A0F8 - thumb_func_start sub_813A118 -sub_813A118: @ 813A118 + thumb_func_start ItemStorage_Withdraw +ItemStorage_Withdraw: @ 813A118 push {r4-r7,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -692,11 +692,11 @@ _0813A188: bx r0 .align 2, 0 _0813A190: .4byte gOtherText_NoItems -_0813A194: .4byte sub_8139E40 - thumb_func_end sub_813A118 +_0813A194: .4byte PlayerPC_ItemStorage + thumb_func_end ItemStorage_Withdraw - thumb_func_start sub_813A198 -sub_813A198: @ 813A198 + thumb_func_start ItemStorage_Toss +ItemStorage_Toss: @ 813A198 push {r4-r7,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -753,11 +753,11 @@ _0813A20C: bx r0 .align 2, 0 _0813A214: .4byte gOtherText_NoItems -_0813A218: .4byte sub_8139E40 - thumb_func_end sub_813A198 +_0813A218: .4byte PlayerPC_ItemStorage + thumb_func_end ItemStorage_Toss - thumb_func_start sub_813A21C -sub_813A21C: @ 813A21C + thumb_func_start ItemStorage_Exit +ItemStorage_Exit: @ 813A21C push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -769,11 +769,11 @@ sub_813A21C: @ 813A21C movs r3, 0x9 bl MenuZeroFillWindowRect adds r0, r4, 0 - bl sub_8139E24 + bl ReshowPlayerPC pop {r4} pop {r0} bx r0 - thumb_func_end sub_813A21C + thumb_func_end ItemStorage_Exit thumb_func_start sub_813A240 sub_813A240: @ 813A240 @@ -1076,7 +1076,7 @@ sub_813A468: @ 813A468 lsls r4, 3 adds r4, r0 ldrb r0, [r4, 0x14] - bl sub_8139F58 + bl InitItemStorageMenu ldr r0, _0813A4B0 @ =sub_8139FD4 str r0, [r4] pop {r4,r5} @@ -1084,7 +1084,7 @@ sub_813A468: @ 813A468 bx r0 .align 2, 0 _0813A4AC: .4byte gTasks -_0813A4B0: .4byte sub_8139FD4 +_0813A4B0: .4byte ItemStorageMenuProcessInput thumb_func_end sub_813A468 thumb_func_start sub_813A4B4 @@ -2896,7 +2896,7 @@ sub_813B300: @ 813B300 movs r3, 0x13 bl MenuZeroFillWindowRect adds r0, r4, 0 - bl sub_8139E24 + bl ReshowPlayerPC pop {r4} pop {r0} bx r0 @@ -3025,15 +3025,15 @@ _0813B40C: movs r0, 0x5 bl PlaySE adds r0, r4, 0 - bl sub_813B734 + bl Mailbox_Cancel _0813B420: pop {r4,r5} pop {r0} bx r0 thumb_func_end sub_813B3A0 - thumb_func_start sub_813B428 -sub_813B428: @ 813B428 + thumb_func_start Mailbox_Read +Mailbox_Read: @ 813B428 push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -3054,7 +3054,7 @@ sub_813B428: @ 813B428 .align 2, 0 _0813B44C: .4byte gTasks _0813B450: .4byte sub_813B454 - thumb_func_end sub_813B428 + thumb_func_end Mailbox_Read thumb_func_start sub_813B454 sub_813B454: @ 813B454 @@ -3151,8 +3151,8 @@ _0813B508: .4byte sub_813B4D0 _0813B50C: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_813B4F0 - thumb_func_start sub_813B510 -sub_813B510: @ 813B510 + thumb_func_start Mailbox_MoveToBag +Mailbox_MoveToBag: @ 813B510 push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -3179,7 +3179,7 @@ _0813B544: .4byte gOtherText_MoveToBag _0813B548: .4byte gUnknown_0840633A _0813B54C: .4byte gOtherText_MessageWillBeLost _0813B550: .4byte sub_813B554 - thumb_func_end sub_813B510 + thumb_func_end Mailbox_MoveToBag thumb_func_start sub_813B554 sub_813B554: @ 813B554 @@ -3290,8 +3290,8 @@ sub_813B610: @ 813B610 bx r0 thumb_func_end sub_813B610 - thumb_func_start sub_813B630 -sub_813B630: @ 813B630 + thumb_func_start Mailbox_Give +Mailbox_Give: @ 813B630 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -3320,7 +3320,7 @@ _0813B65E: .align 2, 0 _0813B664: .4byte gTasks _0813B668: .4byte sub_813B66C - thumb_func_end sub_813B630 + thumb_func_end Mailbox_Give thumb_func_start sub_813B66C sub_813B66C: @ 813B66C @@ -3422,8 +3422,8 @@ _0813B72C: .4byte gOtherText_NoPokemon _0813B730: .4byte sub_813B758 thumb_func_end sub_813B718 - thumb_func_start sub_813B734 -sub_813B734: @ 813B734 + thumb_func_start Mailbox_Cancel +Mailbox_Cancel: @ 813B734 push {r4,lr} adds r4, r0, 0 lsls r4, 24 @@ -3439,7 +3439,7 @@ sub_813B734: @ 813B734 pop {r4} pop {r0} bx r0 - thumb_func_end sub_813B734 + thumb_func_end Mailbox_Cancel thumb_func_start sub_813B758 sub_813B758: @ 813B758 diff --git a/asm/rom3.s b/asm/rom3.s index d6717f28e..04fe5e626 100644 --- a/asm/rom3.s +++ b/asm/rom3.s @@ -81370,8 +81370,8 @@ _08034BF4: .4byte gUnknown_03004330 _08034BF8: .4byte sub_8033160 thumb_func_end sub_8034B74 - thumb_func_start c2_8123744 -c2_8123744: @ 8034BFC + thumb_func_start sub_8034BFC +sub_8034BFC: @ 8034BFC push {r4-r6,lr} mov r6, r9 mov r5, r8 @@ -81579,7 +81579,7 @@ _08034DB0: .4byte 0xfffffc00 _08034DB4: .4byte sub_80313A0 _08034DB8: .4byte gUnknown_03004330 _08034DBC: .4byte sub_8032B4C - thumb_func_end c2_8123744 + thumb_func_end sub_8034BFC thumb_func_start sub_8034DC0 sub_8034DC0: @ 8034DC0 diff --git a/asm/rom4.s b/asm/rom4.s index 04ef9cbe0..f195272e4 100644 --- a/asm/rom4.s +++ b/asm/rom4.s @@ -4103,8 +4103,8 @@ _08057430: bx r1 thumb_func_end MetatileBehavior_IsUnusedFootprintMetatile - thumb_func_start sub_8057434 -sub_8057434: @ 8057434 + thumb_func_start MetatileBehavior_IsBridge +MetatileBehavior_IsBridge: @ 8057434 push {lr} lsls r0, 24 movs r1, 0x90 @@ -4120,7 +4120,7 @@ _08057448: _0805744A: pop {r1} bx r1 - thumb_func_end sub_8057434 + thumb_func_end MetatileBehavior_IsBridge thumb_func_start sub_8057450 sub_8057450: @ 8057450 @@ -4138,8 +4138,8 @@ _08057462: bx r1 thumb_func_end sub_8057450 - thumb_func_start sub_8057468 -sub_8057468: @ 8057468 + thumb_func_start MetatileBehavior_IsLandWildEncounter +MetatileBehavior_IsLandWildEncounter: @ 8057468 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -4162,10 +4162,10 @@ _0805748E: pop {r4} pop {r1} bx r1 - thumb_func_end sub_8057468 + thumb_func_end MetatileBehavior_IsLandWildEncounter - thumb_func_start sub_8057494 -sub_8057494: @ 8057494 + thumb_func_start MetatileBehavior_IsWaterWildEncounter +MetatileBehavior_IsWaterWildEncounter: @ 8057494 push {r4,lr} lsls r0, 24 lsrs r4, r0, 24 @@ -4189,7 +4189,7 @@ _080574BC: pop {r4} pop {r1} bx r1 - thumb_func_end sub_8057494 + thumb_func_end MetatileBehavior_IsWaterWildEncounter thumb_func_start sub_80574C4 sub_80574C4: @ 80574C4 diff --git a/asm/secret_base.s b/asm/secret_base.s index 5d28e1455..9a41a2dd8 100644 --- a/asm/secret_base.s +++ b/asm/secret_base.s @@ -2054,15 +2054,15 @@ _080BC45C: .4byte gSaveBlock1 _080BC460: .4byte 0x00001a16 thumb_func_end sub_80BC440 - thumb_func_start sub_80BC464 -sub_80BC464: @ 80BC464 + thumb_func_start SecretBasePC_PackUp +SecretBasePC_PackUp: @ 80BC464 push {lr} movs r0, 0x14 bl sav12_xor_increment bl sub_80BC440 pop {r0} bx r0 - thumb_func_end sub_80BC464 + thumb_func_end SecretBasePC_PackUp thumb_func_start sub_80BC474 sub_80BC474: @ 80BC474 @@ -2273,8 +2273,8 @@ _080BC5FC: .4byte gSaveBlock1 _080BC600: .4byte 0x00001a09 thumb_func_end sub_80BC5BC - thumb_func_start sub_80BC604 -sub_80BC604: @ 80BC604 + thumb_func_start SecretBasePC_Decoration +SecretBasePC_Decoration: @ 80BC604 push {lr} ldr r0, _080BC614 @ =sub_80FE264 movs r1, 0 @@ -2282,11 +2282,11 @@ sub_80BC604: @ 80BC604 pop {r0} bx r0 .align 2, 0 -_080BC614: .4byte sub_80FE264 - thumb_func_end sub_80BC604 +_080BC614: .4byte Task_SecretBasePC_Decoration + thumb_func_end SecretBasePC_Decoration - thumb_func_start sub_80BC618 -sub_80BC618: @ 80BC618 + thumb_func_start SecretBasePC_Registry +SecretBasePC_Registry: @ 80BC618 push {lr} ldr r0, _080BC628 @ =sub_80BC62C movs r1, 0 @@ -2294,11 +2294,11 @@ sub_80BC618: @ 80BC618 pop {r0} bx r0 .align 2, 0 -_080BC628: .4byte sub_80BC62C - thumb_func_end sub_80BC618 +_080BC628: .4byte Task_SecretBasePC_Registry + thumb_func_end SecretBasePC_Registry - thumb_func_start sub_80BC62C -sub_80BC62C: @ 80BC62C + thumb_func_start Task_SecretBasePC_Registry +Task_SecretBasePC_Registry: @ 80BC62C push {r4,r5,lr} lsls r0, 24 lsrs r5, r0, 24 @@ -2357,7 +2357,7 @@ _080BC6A0: .align 2, 0 _080BC6A8: .4byte gSecretBaseText_NoRegistry _080BC6AC: .4byte sub_80BCC54 - thumb_func_end sub_80BC62C + thumb_func_end Task_SecretBasePC_Registry thumb_func_start sub_80BC6B0 sub_80BC6B0: @ 80BC6B0 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 diff --git a/src/wild_encounter.c b/src/wild_encounter.c index 8fcadbb3b..0a797d9a9 100644 --- a/src/wild_encounter.c +++ b/src/wild_encounter.c @@ -31,11 +31,11 @@ extern u32 sub_80C8448(void); extern s16 sub_810CAE4(u8, u32); extern bool32 GetSafariZoneFlag(void); extern u8 TestPlayerAvatarFlags(u8); -extern u8 sub_8057468(u8); +extern u8 MetatileBehavior_IsLandWildEncounter(u8); extern u8 sub_81344CC(void); -extern u8 sub_8057494(u8); +extern u8 MetatileBehavior_IsWaterWildEncounter(u8); extern void sub_8081A00(void); -extern u8 sub_8057434(u8); +extern u8 MetatileBehavior_IsBridge(u8); extern void PlayerGetDestCoords(u16 *x, u16 *y); extern void sub_80BEA50(u16); extern void sav12_xor_increment(u8); @@ -480,7 +480,7 @@ bool8 StandardWildEncounter(u16 a, u16 b) if(unk != 0xFFFF) { - if(sub_8057468(a) == 1) + if(MetatileBehavior_IsLandWildEncounter(a) == 1) { if(gWildMonHeaders[unk].landMonsInfo) { @@ -516,7 +516,7 @@ bool8 StandardWildEncounter(u16 a, u16 b) else { //_080851D8 - if(sub_8057494(a) == TRUE || TestPlayerAvatarFlags(8) && sub_8057434(a) == TRUE) + if(MetatileBehavior_IsWaterWildEncounter(a) == TRUE || TestPlayerAvatarFlags(8) && MetatileBehavior_IsBridge(a) == TRUE) { if(gWildMonHeaders[unk].waterMonsInfo) { @@ -590,7 +590,7 @@ u8 SweetScentWildEncounter(void) //headerNum = GetCurrentMapWildMonHeader(); if((headerNum = GetCurrentMapWildMonHeader()) != 0xFFFF) { - if(sub_8057468(MapGridGetMetatileBehaviorAt(x, y)) == 1) + if(MetatileBehavior_IsLandWildEncounter(MapGridGetMetatileBehaviorAt(x, y)) == 1) { wildPokemonInfo = gWildMonHeaders[headerNum].landMonsInfo; @@ -616,7 +616,7 @@ u8 SweetScentWildEncounter(void) //_08085380 else { - if(sub_8057494(MapGridGetMetatileBehaviorAt(x, y)) == 1) + if(MetatileBehavior_IsWaterWildEncounter(MapGridGetMetatileBehaviorAt(x, y)) == 1) { wildPokemonInfo = gWildMonHeaders[headerNum].waterMonsInfo; |