diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/battle_1.s | 2 | ||||
| -rw-r--r-- | asm/battle_4.s | 4 | ||||
| -rw-r--r-- | asm/battle_5.s | 8 | ||||
| -rw-r--r-- | asm/cable_club.s | 406 | ||||
| -rw-r--r-- | asm/contest.s | 6 | ||||
| -rw-r--r-- | asm/daycare.s | 8 | ||||
| -rw-r--r-- | asm/decoration_inventory.s | 14 | ||||
| -rw-r--r-- | asm/easy_chat.s | 6 | ||||
| -rw-r--r-- | asm/field_screen_effect.s (renamed from asm/rom_8080874.s) | 0 | ||||
| -rw-r--r-- | asm/field_specials.s | 80 | ||||
| -rw-r--r-- | asm/field_weather.s (renamed from asm/field_screeneffect.s) | 6 | ||||
| -rw-r--r-- | asm/item_menu.s | 8 | ||||
| -rw-r--r-- | asm/mail_data.s | 266 | ||||
| -rw-r--r-- | asm/menu_helpers.s | 2 | ||||
| -rw-r--r-- | asm/mystery_event_script.s | 4 | ||||
| -rw-r--r-- | asm/party_menu.s | 32 | ||||
| -rw-r--r-- | asm/player_pc.s | 2 | ||||
| -rw-r--r-- | asm/pokeblock.s | 16 | ||||
| -rw-r--r-- | asm/pokemon_icon.s | 10 | ||||
| -rw-r--r-- | asm/pokemon_menu.s | 10 | ||||
| -rw-r--r-- | asm/pokemon_storage_system.s | 205 | ||||
| -rw-r--r-- | asm/pokenav.s | 62 | ||||
| -rw-r--r-- | asm/region_map.s | 2 | ||||
| -rw-r--r-- | asm/reshow_battle_screen.s (renamed from asm/rom5.s) | 16 | ||||
| -rw-r--r-- | asm/secret_base.s | 50 | ||||
| -rw-r--r-- | asm/slot_machine.s | 312 | ||||
| -rw-r--r-- | asm/trade.s | 6 | ||||
| -rw-r--r-- | asm/tv.s | 12 |
28 files changed, 151 insertions, 1404 deletions
diff --git a/asm/battle_1.s b/asm/battle_1.s index 5fe4672d9..44d0b245f 100644 --- a/asm/battle_1.s +++ b/asm/battle_1.s @@ -1358,7 +1358,7 @@ _0800E148: ldrsh r0, [r1, r5] cmp r0, 0 beq _0800E154 - bl sub_800DC24 + bl PrintLinkBattleWinLossTie _0800E154: movs r0, 0x78 bl PlaySE diff --git a/asm/battle_4.s b/asm/battle_4.s index c1a6513be..0581d1e7d 100644 --- a/asm/battle_4.s +++ b/asm/battle_4.s @@ -15879,7 +15879,7 @@ _08023C3E: subs r2, 0x1 lsls r2, 24 lsrs r2, 24 - ldr r3, _08023C78 @ =sub_807AD58 + ldr r3, _08023C78 @ =ReshowBattleScreenAfterMenu ldr r4, _08023C7C @ =word_2024E82 ldrh r4, [r4] str r4, [sp] @@ -15894,7 +15894,7 @@ _08023C68: .4byte gPaletteFade _08023C6C: .4byte gPlayerParty _08023C70: .4byte 0x00016018 _08023C74: .4byte gPlayerPartyCount -_08023C78: .4byte sub_807AD58 +_08023C78: .4byte ReshowBattleScreenAfterMenu _08023C7C: .4byte word_2024E82 _08023C80: .4byte 0x0001601a _08023C84: diff --git a/asm/battle_5.s b/asm/battle_5.s index ec95d76db..01541c120 100644 --- a/asm/battle_5.s +++ b/asm/battle_5.s @@ -4487,23 +4487,23 @@ nullsub_8: @ 802E410 thumb_func_start sub_802E414 sub_802E414: @ 802E414 push {lr} - ldr r0, _0802E420 @ =sub_807AD58 + ldr r0, _0802E420 @ =ReshowBattleScreenAfterMenu bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 -_0802E420: .4byte sub_807AD58 +_0802E420: .4byte ReshowBattleScreenAfterMenu thumb_func_end sub_802E414 thumb_func_start sub_802E424 sub_802E424: @ 802E424 push {lr} - ldr r0, _0802E430 @ =sub_807AD58 + ldr r0, _0802E430 @ =ReshowBattleScreenAfterMenu bl SetMainCallback2 pop {r0} bx r0 .align 2, 0 -_0802E430: .4byte sub_807AD58 +_0802E430: .4byte ReshowBattleScreenAfterMenu thumb_func_end sub_802E424 thumb_func_start sub_802E434 diff --git a/asm/cable_club.s b/asm/cable_club.s index 4c9dca6af..bd7a2bd5c 100644 --- a/asm/cable_club.s +++ b/asm/cable_club.s @@ -464,413 +464,15 @@ _08083034: .4byte gTasks _08083038: .4byte sub_808303C thumb_func_end sub_8082FEC - thumb_func_start sub_808303C -sub_808303C: @ 808303C - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - lsls r0, 24 - lsrs r4, r0, 24 - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - mov r8, r0 - ldr r0, _080830D0 @ =gTasks + 0x8 - mov r9, r0 - mov r7, r8 - add r7, r9 - bl GetLinkPlayerCount_2 - lsls r0, 24 - lsrs r5, r0, 24 - adds r0, r4, 0 - bl sub_8082E28 - cmp r0, 0x1 - beq _080830C2 - adds r0, r4, 0 - bl sub_8082EB8 - cmp r0, 0x1 - beq _080830C2 - adds r0, r4, 0 - bl sub_8082DF4 - cmp r0, 0x1 - beq _080830C2 - adds r6, r5, 0 - adds r0, r4, 0 - adds r1, r6, 0 - bl sub_8082D60 - ldr r0, _080830D4 @ =gMain - ldrh r1, [r0, 0x2E] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _080830C2 - movs r1, 0x2 - ldrsh r0, [r7, r1] - cmp r5, r0 - blt _080830C2 - adds r0, r6, 0 - bl sub_80081C8 - bl sub_8082D4C - ldr r0, _080830D8 @ =gStringVar1 - adds r1, r5, 0 - movs r2, 0 - movs r3, 0x1 - bl ConvertIntToDecimalStringN - ldr r0, _080830DC @ =gUnknown_081A4975 - bl ShowFieldAutoScrollMessage - mov r0, r9 - subs r0, 0x8 - add r0, r8 - ldr r1, _080830E0 @ =sub_80830E4 - str r1, [r0] -_080830C2: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080830D0: .4byte gTasks + 0x8 -_080830D4: .4byte gMain -_080830D8: .4byte gStringVar1 -_080830DC: .4byte gUnknown_081A4975 -_080830E0: .4byte sub_80830E4 - thumb_func_end sub_808303C +.section .text_80830E4 + + + - thumb_func_start sub_80830E4 -sub_80830E4: @ 80830E4 - push {r4-r6,lr} - lsls r0, 24 - lsrs r5, r0, 24 - adds r6, r5, 0 - adds r0, r5, 0 - bl sub_8082E28 - cmp r0, 0x1 - beq _08083178 - adds r0, r5, 0 - bl sub_8082EB8 - cmp r0, 0x1 - beq _08083178 - adds r0, r5, 0 - bl sub_8082DF4 - cmp r0, 0x1 - beq _08083178 - bl GetFieldMessageBoxMode - lsls r0, 24 - cmp r0, 0 - bne _08083178 - bl sub_800820C - adds r4, r0, 0 - bl GetLinkPlayerCount_2 - lsls r4, 24 - lsls r0, 24 - cmp r4, r0 - bne _08083132 - ldr r0, _08083148 @ =gMain - ldrh r1, [r0, 0x2C] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _08083158 -_08083132: - ldr r0, _0808314C @ =gUnknown_081A4932 - bl ShowFieldAutoScrollMessage - ldr r1, _08083150 @ =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r0, r1 - ldr r1, _08083154 @ =sub_8082FEC - str r1, [r0] - b _08083178 - .align 2, 0 -_08083148: .4byte gMain -_0808314C: .4byte gUnknown_081A4932 -_08083150: .4byte gTasks -_08083154: .4byte sub_8082FEC -_08083158: - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08083178 - movs r0, 0x5 - bl PlaySE - bl sub_8007F4C - ldr r0, _08083180 @ =gTasks - lsls r1, r6, 2 - adds r1, r6 - lsls r1, 3 - adds r1, r0 - ldr r0, _08083184 @ =sub_8083188 - str r0, [r1] -_08083178: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08083180: .4byte gTasks -_08083184: .4byte sub_8083188 - thumb_func_end sub_80830E4 - thumb_func_start sub_8083188 -sub_8083188: @ 8083188 - push {r4-r7,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r1, _080831CC @ =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r5, r0, r1 - ldrb r7, [r5, 0xA] - ldrb r6, [r5, 0xC] - adds r0, r4, 0 - bl sub_8082DF4 - cmp r0, 0x1 - beq _080831EA - adds r0, r4, 0 - bl sub_8083444 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _080831EA - bl GetLinkPlayerCount_2 - adds r4, r0, 0 - bl sub_800820C - lsls r4, 24 - lsls r0, 24 - cmp r4, r0 - beq _080831D4 - ldr r0, _080831D0 @ =sub_8083418 - b _080831E8 - .align 2, 0 -_080831CC: .4byte gTasks -_080831D0: .4byte sub_8083418 -_080831D4: - ldr r4, _080831F0 @ =gScriptResult - adds r0, r7, 0 - adds r1, r6, 0 - bl sub_8082D9C - strh r0, [r4] - lsls r0, 16 - cmp r0, 0 - beq _080831EA - ldr r0, _080831F4 @ =sub_8083288 -_080831E8: - str r0, [r5] -_080831EA: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080831F0: .4byte gScriptResult -_080831F4: .4byte sub_8083288 - thumb_func_end sub_8083188 - thumb_func_start sub_80831F8 -sub_80831F8: @ 80831F8 - push {r4-r7,lr} - lsls r0, 24 - lsrs r4, r0, 24 - ldr r1, _08083244 @ =gTasks - lsls r0, r4, 2 - adds r0, r4 - lsls r0, 3 - adds r5, r0, r1 - ldrb r7, [r5, 0xA] - ldrb r6, [r5, 0xC] - adds r0, r4, 0 - bl sub_8082E28 - cmp r0, 0x1 - beq _08083270 - adds r0, r4, 0 - bl sub_8082DF4 - cmp r0, 0x1 - beq _08083270 - ldr r4, _08083248 @ =gScriptResult - adds r0, r7, 0 - adds r1, r6, 0 - bl sub_8082D9C - strh r0, [r4] - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0 - beq _08083270 - cmp r0, 0x3 - bne _08083250 - bl sub_800832C - bl HideFieldMessageBox - ldr r0, _0808324C @ =sub_80833C4 - b _0808326E - .align 2, 0 -_08083244: .4byte gTasks -_08083248: .4byte gScriptResult -_0808324C: .4byte sub_80833C4 -_08083250: - bl GetLinkPlayerCount_2 - ldr r4, _08083278 @ =gFieldLinkPlayerCount - strb r0, [r4] - bl GetMultiplayerId - ldr r1, _0808327C @ =gUnknown_03004860 - strb r0, [r1] - ldrb r0, [r4] - bl sub_80081C8 - ldr r0, _08083280 @ =gBlockSendBuffer - bl sub_8093390 - ldr r0, _08083284 @ =sub_8083314 -_0808326E: - str r0, [r5] -_08083270: - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08083278: .4byte gFieldLinkPlayerCount -_0808327C: .4byte gUnknown_03004860 -_08083280: .4byte gBlockSendBuffer -_08083284: .4byte sub_8083314 - thumb_func_end sub_80831F8 - thumb_func_start sub_8083288 -sub_8083288: @ 8083288 - push {r4,r5,lr} - lsls r0, 24 - lsrs r4, r0, 24 - adds r5, r4, 0 - adds r0, r4, 0 - bl sub_8082DF4 - cmp r0, 0x1 - beq _080832F8 - ldr r0, _080832BC @ =gScriptResult - ldrh r0, [r0] - cmp r0, 0x3 - bne _080832C8 - bl sub_800832C - bl HideFieldMessageBox - ldr r0, _080832C0 @ =gTasks - lsls r1, r4, 2 - adds r1, r4 - lsls r1, 3 - adds r1, r0 - ldr r0, _080832C4 @ =sub_80833C4 - str r0, [r1] - b _080832F8 - .align 2, 0 -_080832BC: .4byte gScriptResult -_080832C0: .4byte gTasks -_080832C4: .4byte sub_80833C4 -_080832C8: - bl GetLinkPlayerCount_2 - ldr r4, _08083300 @ =gFieldLinkPlayerCount - strb r0, [r4] - bl GetMultiplayerId - ldr r1, _08083304 @ =gUnknown_03004860 - strb r0, [r1] - ldrb r0, [r4] - bl sub_80081C8 - ldr r0, _08083308 @ =gBlockSendBuffer - bl sub_8093390 - ldr r1, _0808330C @ =gTasks - lsls r0, r5, 2 - adds r0, r5 - lsls r0, 3 - adds r0, r1 - ldr r1, _08083310 @ =sub_8083314 - str r1, [r0] - movs r0, 0x2 - bl sub_8007E9C -_080832F8: - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08083300: .4byte gFieldLinkPlayerCount -_08083304: .4byte gUnknown_03004860 -_08083308: .4byte gBlockSendBuffer -_0808330C: .4byte gTasks -_08083310: .4byte sub_8083314 - thumb_func_end sub_8083288 - thumb_func_start sub_8083314 -sub_8083314: @ 8083314 - push {r4-r6,lr} - lsls r0, 24 - lsrs r5, r0, 24 - adds r0, r5, 0 - bl sub_8082DF4 - cmp r0, 0x1 - beq _080833B6 - bl GetBlockReceivedStatus - adds r4, r0, 0 - bl sub_8008198 - lsls r4, 24 - lsls r0, 24 - cmp r4, r0 - bne _080833B6 - movs r4, 0 - ldr r6, _0808333C @ =gTrainerCards - b _0808335A - .align 2, 0 -_0808333C: .4byte gTrainerCards -_08083340: - lsls r1, r4, 8 - ldr r0, _08083394 @ =gBlockRecvBuffer - adds r1, r0 - lsls r0, r4, 3 - subs r0, r4 - lsls r0, 3 - adds r0, r6 - movs r2, 0x38 - bl memcpy - adds r0, r4, 0x1 - lsls r0, 24 - lsrs r4, r0, 24 -_0808335A: - bl GetLinkPlayerCount - lsls r0, 24 - lsrs r0, 24 - cmp r4, r0 - bcc _08083340 - movs r0, 0 - bl SetSuppressLinkErrorMessage - bl ResetBlockReceivedFlags - bl HideFieldMessageBox - ldr r0, _08083398 @ =gScriptResult - ldrh r0, [r0] - cmp r0, 0x1 - bne _080833A4 - ldr r0, _0808339C @ =gLinkType - ldrh r1, [r0] - ldr r0, _080833A0 @ =0x00004411 - bl sub_8082D4C - bl EnableBothScriptContexts - adds r0, r5, 0 - bl DestroyTask - b _080833B6 - .align 2, 0 -_08083394: .4byte gBlockRecvBuffer -_08083398: .4byte gScriptResult -_0808339C: .4byte gLinkType -_080833A0: .4byte 0x00004411 -_080833A4: - bl sub_800832C - ldr r0, _080833BC @ =gTasks - lsls r1, r5, 2 - adds r1, r5 - lsls r1, 3 - adds r1, r0 - ldr r0, _080833C0 @ =sub_80833C4 - str r0, [r1] -_080833B6: - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_080833BC: .4byte gTasks -_080833C0: .4byte sub_80833C4 - thumb_func_end sub_8083314 thumb_func_start sub_80833C4 sub_80833C4: @ 80833C4 diff --git a/asm/contest.s b/asm/contest.s index 3f53a31e9..214935952 100644 --- a/asm/contest.s +++ b/asm/contest.s @@ -11,15 +11,15 @@ nullsub_89: @ 80AB1AC bx lr thumb_func_end nullsub_89 - thumb_func_start sub_80AB1B0 -sub_80AB1B0: @ 80AB1B0 + thumb_func_start ResetLinkContestBoolean +ResetLinkContestBoolean: @ 80AB1B0 ldr r1, _080AB1B8 @ =gIsLinkContest movs r0, 0 strb r0, [r1] bx lr .align 2, 0 _080AB1B8: .4byte gIsLinkContest - thumb_func_end sub_80AB1B0 + thumb_func_end ResetLinkContestBoolean thumb_func_start sub_80AB1BC sub_80AB1BC: @ 80AB1BC diff --git a/asm/daycare.s b/asm/daycare.s index 0e8a796d9..47a84e8e0 100644 --- a/asm/daycare.s +++ b/asm/daycare.s @@ -111,7 +111,7 @@ sub_80413C8: @ 80413C8 lsrs r4, r0, 24 mov r9, r4 adds r0, r7, 0 - bl sub_80A2B94 + bl MonHasMail lsls r0, 24 cmp r0, 0 beq _0804144A @@ -156,7 +156,7 @@ sub_80413C8: @ 80413C8 ldm r1!, {r0,r2,r3} stm r4!, {r0,r2,r3} adds r0, r7, 0 - bl sub_80A2DF8 + bl TakeMailFromMon _0804144A: mov r2, r9 lsls r4, r2, 24 @@ -372,7 +372,7 @@ _080415D8: adds r4, r5, r4 mov r0, r8 adds r1, r4, 0 - bl sub_80A2D88 + bl GiveMailToMon2 adds r0, r4, 0 bl sub_80417F4 _08041610: @@ -644,7 +644,7 @@ _08041812: subs r1, 0x1 cmp r1, r2 bge _08041812 - bl sub_80A2B40 + bl ClearMailStruct pop {r0} bx r0 thumb_func_end sub_80417F4 diff --git a/asm/decoration_inventory.s b/asm/decoration_inventory.s index e44c1abf2..953d770ae 100644 --- a/asm/decoration_inventory.s +++ b/asm/decoration_inventory.s @@ -6,8 +6,8 @@ .text - thumb_func_start sub_8133F4C -sub_8133F4C: @ 8133F4C + thumb_func_start ClearDecorationInventory +ClearDecorationInventory: @ 8133F4C push {r4,r5,lr} lsls r0, 24 movs r3, 0 @@ -36,15 +36,15 @@ _08133F76: bx r0 .align 2, 0 _08133F7C: .4byte gDecorationInventories - thumb_func_end sub_8133F4C + thumb_func_end ClearDecorationInventory - thumb_func_start sub_8133F80 -sub_8133F80: @ 8133F80 + thumb_func_start ClearDecorationInventories +ClearDecorationInventories: @ 8133F80 push {r4,lr} movs r4, 0 _08133F84: adds r0, r4, 0 - bl sub_8133F4C + bl ClearDecorationInventory adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -53,7 +53,7 @@ _08133F84: pop {r4} pop {r0} bx r0 - thumb_func_end sub_8133F80 + thumb_func_end ClearDecorationInventories thumb_func_start sub_8133F9C sub_8133F9C: @ 8133F9C diff --git a/asm/easy_chat.s b/asm/easy_chat.s index b8bfaac18..b9f27b895 100644 --- a/asm/easy_chat.s +++ b/asm/easy_chat.s @@ -825,8 +825,8 @@ _080E675C: .4byte 0x00009da4 _080E6760: .4byte 0x00009f6e thumb_func_end sub_80E6690 - thumb_func_start sub_80E6764 -sub_80E6764: @ 80E6764 + thumb_func_start InitEasyChatPhrases +InitEasyChatPhrases: @ 80E6764 push {r4-r6,lr} movs r3, 0 ldr r4, _080E680C @ =gSaveBlock1 + 0x2B1C @@ -926,7 +926,7 @@ _080E681C: .4byte gSaveBlock1 + 0x2B34 _080E6820: .4byte 0x0000ffff _080E6824: .4byte gSaveBlock1 + 0x2B4C _080E6828: .4byte gSaveBlock1 + 0x2D8C - thumb_func_end sub_80E6764 + thumb_func_end InitEasyChatPhrases thumb_func_start sub_80E682C sub_80E682C: @ 80E682C diff --git a/asm/rom_8080874.s b/asm/field_screen_effect.s index 4fbfae1a2..4fbfae1a2 100644 --- a/asm/rom_8080874.s +++ b/asm/field_screen_effect.s diff --git a/asm/field_specials.s b/asm/field_specials.s index 684ab248b..63677b6a0 100644 --- a/asm/field_specials.s +++ b/asm/field_specials.s @@ -33,8 +33,8 @@ ResetSSTidalFlag: @ 810D9A0 _0810D9AC: .4byte 0x0000082d thumb_func_end ResetSSTidalFlag - thumb_func_start sub_810D9B0 -sub_810D9B0: @ 810D9B0 + thumb_func_start CountSSTidalStep +CountSSTidalStep: @ 810D9B0 push {r4,lr} lsls r0, 16 lsrs r4, r0, 16 @@ -64,10 +64,10 @@ _0810D9E6: pop {r4} pop {r1} bx r1 - thumb_func_end sub_810D9B0 + thumb_func_end CountSSTidalStep - thumb_func_start sub_810D9EC -sub_810D9EC: @ 810D9EC + thumb_func_start GetSSTidalLocation +GetSSTidalLocation: @ 810D9EC push {r4-r7,lr} mov r7, r8 push {r7} @@ -179,7 +179,7 @@ _0810DABE: pop {r4-r7} pop {r1} bx r1 - thumb_func_end sub_810D9EC + thumb_func_end GetSSTidalLocation thumb_func_start GetLinkPartnerNames GetLinkPartnerNames: @ 810DAC8 @@ -231,8 +231,8 @@ _0810DB20: .4byte gUnknown_083D1464 _0810DB24: .4byte gLinkPlayers + 0x8 thumb_func_end GetLinkPartnerNames - thumb_func_start sub_810DB28 -sub_810DB28: @ 810DB28 + thumb_func_start SpawnBerryBlenderLinkPlayerSprites +SpawnBerryBlenderLinkPlayerSprites: @ 810DB28 push {r4-r7,lr} mov r7, r10 mov r6, r9 @@ -403,10 +403,10 @@ _0810DC5C: .align 2, 0 _0810DC74: .4byte gLinkPlayers _0810DC78: .4byte gSpecialVar_0x8004 - thumb_func_end sub_810DB28 + thumb_func_end SpawnBerryBlenderLinkPlayerSprites - thumb_func_start sub_810DC7C -sub_810DC7C: @ 810DC7C + thumb_func_start MauvilleGymSpecial1 +MauvilleGymSpecial1: @ 810DC7C push {r4,r5,lr} movs r4, 0 ldr r5, _0810DC9C @ =gUnknown_083F8364 @@ -444,10 +444,10 @@ _0810DCB6: bx r0 .align 2, 0 _0810DCC8: .4byte 0x00000205 - thumb_func_end sub_810DC7C + thumb_func_end MauvilleGymSpecial1 - thumb_func_start sub_810DCCC -sub_810DCCC: @ 810DCCC + thumb_func_start MauvilleGymSpecial2 +MauvilleGymSpecial2: @ 810DCCC push {r4-r6,lr} movs r5, 0xC _0810DCD0: @@ -681,10 +681,10 @@ _0810DED0: bx r0 .align 2, 0 _0810DED8: .4byte 0x00000251 - thumb_func_end sub_810DCCC + thumb_func_end MauvilleGymSpecial2 - thumb_func_start sub_810DEDC -sub_810DEDC: @ 810DEDC + thumb_func_start MauvilleGymSpecial3 +MauvilleGymSpecial3: @ 810DEDC push {r4-r6,lr} ldr r4, _0810DF18 @ =gUnknown_083F8364 movs r5, 0x2 @@ -850,10 +850,10 @@ _0810E066: bx r0 .align 2, 0 _0810E06C: .4byte 0x00000251 - thumb_func_end sub_810DEDC + thumb_func_end MauvilleGymSpecial3 - thumb_func_start sub_810E070 -sub_810E070: @ 810E070 + thumb_func_start PetalburgGymSpecial1 +PetalburgGymSpecial1: @ 810E070 push {lr} ldr r0, _0810E090 @ =gUnknown_02039258 movs r1, 0 @@ -862,7 +862,7 @@ sub_810E070: @ 810E070 strb r1, [r0] movs r0, 0x2C bl PlaySE - ldr r0, _0810E098 @ =sub_810E09C + ldr r0, _0810E098 @ =Task_PetalburgGym movs r1, 0x8 bl CreateTask pop {r0} @@ -870,11 +870,11 @@ sub_810E070: @ 810E070 .align 2, 0 _0810E090: .4byte gUnknown_02039258 _0810E094: .4byte gUnknown_02039259 -_0810E098: .4byte sub_810E09C - thumb_func_end sub_810E070 +_0810E098: .4byte Task_PetalburgGym + thumb_func_end PetalburgGymSpecial1 - thumb_func_start sub_810E09C -sub_810E09C: @ 810E09C + thumb_func_start Task_PetalburgGym +Task_PetalburgGym: @ 810E09C push {r4-r6,lr} lsls r0, 24 lsrs r6, r0, 24 @@ -893,7 +893,7 @@ sub_810E09C: @ 810E09C lsls r1, 1 adds r1, r2 ldrh r1, [r1] - bl sub_810E104 + bl PetalburgGymFunc movs r0, 0 strb r0, [r4] ldrb r0, [r5] @@ -920,10 +920,10 @@ _0810E0FC: pop {r4-r6} pop {r0} bx r0 - thumb_func_end sub_810E09C + thumb_func_end Task_PetalburgGym - thumb_func_start sub_810E104 -sub_810E104: @ 810E104 + thumb_func_start PetalburgGymFunc +PetalburgGymFunc: @ 810E104 push {r4-r7,lr} mov r7, r9 mov r6, r8 @@ -1078,22 +1078,22 @@ _0810E21E: pop {r4-r7} pop {r0} bx r0 - thumb_func_end sub_810E104 + thumb_func_end PetalburgGymFunc - thumb_func_start sub_810E230 -sub_810E230: @ 810E230 + thumb_func_start PetalburgGymSpecial2 +PetalburgGymSpecial2: @ 810E230 push {lr} ldr r0, _0810E244 @ =gSpecialVar_0x8004 ldrb r0, [r0] ldr r1, _0810E248 @ =gUnknown_083F8376 ldrh r1, [r1, 0x8] - bl sub_810E104 + bl PetalburgGymFunc pop {r0} bx r0 .align 2, 0 _0810E244: .4byte gSpecialVar_0x8004 _0810E248: .4byte gUnknown_083F8376 - thumb_func_end sub_810E230 + thumb_func_end PetalburgGymSpecial2 thumb_func_start ShowFieldMessageStringVar4 ShowFieldMessageStringVar4: @ 810E24C @@ -3695,8 +3695,8 @@ _0810F612: bx r1 thumb_func_end sub_810F5BC - thumb_func_start sub_810F618 -sub_810F618: @ 810F618 + thumb_func_start SetShoalItemFlag +SetShoalItemFlag: @ 810F618 push {lr} ldr r0, _0810F624 @ =0x0000085f bl FlagSet @@ -3704,7 +3704,7 @@ sub_810F618: @ 810F618 bx r0 .align 2, 0 _0810F624: .4byte 0x0000085f - thumb_func_end sub_810F618 + thumb_func_end SetShoalItemFlag thumb_func_start PutZigzagoonInPlayerParty PutZigzagoonInPlayerParty: @ 810F628 @@ -4270,8 +4270,8 @@ _0810FA4A: _0810FA50: .4byte gStringVar1 thumb_func_end sub_810F9AC - thumb_func_start sub_810FA54 -sub_810FA54: @ 810FA54 + thumb_func_start ResetFanClub +ResetFanClub: @ 810FA54 ldr r0, _0810FA68 @ =gSaveBlock1 ldr r2, _0810FA6C @ =0x000013c2 adds r1, r0, r2 @@ -4285,7 +4285,7 @@ sub_810FA54: @ 810FA54 _0810FA68: .4byte gSaveBlock1 _0810FA6C: .4byte 0x000013c2 _0810FA70: .4byte 0x000013c4 - thumb_func_end sub_810FA54 + thumb_func_end ResetFanClub thumb_func_start sub_810FA74 sub_810FA74: @ 810FA74 diff --git a/asm/field_screeneffect.s b/asm/field_weather.s index 01190c75e..92d2ffab2 100644 --- a/asm/field_screeneffect.s +++ b/asm/field_weather.s @@ -7537,8 +7537,8 @@ _0808082E: bx r1 thumb_func_end TranslateWeatherNum - thumb_func_start sub_8080834 -sub_8080834: @ 8080834 + thumb_func_start UpdateWeatherPerDay +UpdateWeatherPerDay: @ 8080834 lsls r0, 16 ldr r2, _08080850 @ =gSaveBlock1 adds r2, 0x2F @@ -7554,7 +7554,7 @@ sub_8080834: @ 8080834 bx lr .align 2, 0 _08080850: .4byte gSaveBlock1 - thumb_func_end sub_8080834 + thumb_func_end UpdateWeatherPerDay thumb_func_start UpdateRainCounter UpdateRainCounter: @ 8080854 diff --git a/asm/item_menu.s b/asm/item_menu.s index 29109f3d9..7463663d8 100644 --- a/asm/item_menu.s +++ b/asm/item_menu.s @@ -709,8 +709,8 @@ _080A370A: bx r0 thumb_func_end sub_80A36B8 - thumb_func_start sub_80A3714 -sub_80A3714: @ 80A3714 + thumb_func_start ClearBag +ClearBag: @ 80A3714 push {r4,r5,lr} movs r4, 0 ldr r5, _080A373C @ =gBagPockets @@ -731,7 +731,7 @@ _080A371A: bx r0 .align 2, 0 _080A373C: .4byte gBagPockets - thumb_func_end sub_80A3714 + thumb_func_end ClearBag thumb_func_start sub_80A3740 sub_80A3740: @ 80A3740 @@ -3413,7 +3413,7 @@ _080A4BB4: .4byte 0x00000103 _080A4BB8: .4byte gOtherText_Walk _080A4BBC: adds r0, r4, 0 - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 diff --git a/asm/mail_data.s b/asm/mail_data.s deleted file mode 100644 index 23425c0cf..000000000 --- a/asm/mail_data.s +++ /dev/null @@ -1,266 +0,0 @@ - .include "constants/gba_constants.inc" - .include "constants/species_constants.inc" - .include "asm/macros.inc" - - .syntax unified - - .text - - thumb_func_start sub_80A2D64 -sub_80A2D64: @ 80A2D64 - push {lr} - lsls r0, 16 - lsrs r3, r0, 16 - ldr r0, _080A2D7C @ =0xffff8ad0 - adds r2, r3, r0 - lsls r0, r2, 16 - lsrs r0, 16 - cmp r0, 0x1B - bhi _080A2D80 - movs r0, 0xC9 - strh r2, [r1] - b _080A2D82 - .align 2, 0 -_080A2D7C: .4byte 0xffff8ad0 -_080A2D80: - adds r0, r3, 0 -_080A2D82: - pop {r1} - bx r1 - thumb_func_end sub_80A2D64 - - thumb_func_start sub_80A2D88 -sub_80A2D88: @ 80A2D88 - push {r4-r7,lr} - sub sp, 0x8 - adds r6, r0, 0 - adds r7, r1, 0 - ldrh r5, [r7, 0x20] - adds r1, r5, 0 - bl sub_80A2BC4 - add r4, sp, 0x4 - strb r0, [r4] - ldrb r2, [r4] - cmp r2, 0xFF - beq _080A2DE8 - ldr r0, _080A2DE0 @ =gSaveBlock1 - lsls r1, r2, 3 - adds r1, r2 - lsls r1, 2 - adds r1, r0 - ldr r0, _080A2DE4 @ =0x00002b4c - adds r1, r0 - adds r0, r7, 0 - ldm r0!, {r2,r3,r7} - stm r1!, {r2,r3,r7} - ldm r0!, {r2,r3,r7} - stm r1!, {r2,r3,r7} - ldm r0!, {r2,r3,r7} - stm r1!, {r2,r3,r7} - adds r0, r6, 0 - movs r1, 0x40 - adds r2, r4, 0 - bl SetMonData - mov r0, sp - strb r5, [r0] - mov r1, sp - lsrs r0, r5, 8 - strb r0, [r1, 0x1] - adds r0, r6, 0 - movs r1, 0xC - mov r2, sp - bl SetMonData - ldrb r0, [r4] - b _080A2DEA - .align 2, 0 -_080A2DE0: .4byte gSaveBlock1 -_080A2DE4: .4byte 0x00002b4c -_080A2DE8: - movs r0, 0xFF -_080A2DEA: - add sp, 0x8 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_80A2D88 - - thumb_func_start unref_sub_80A2DF4 -unref_sub_80A2DF4: @ 80A2DF4 - movs r0, 0 - bx lr - thumb_func_end unref_sub_80A2DF4 - - thumb_func_start sub_80A2DF8 -sub_80A2DF8: @ 80A2DF8 - push {r4,lr} - sub sp, 0x8 - adds r4, r0, 0 - bl sub_80A2B94 - lsls r0, 24 - cmp r0, 0 - beq _080A2E46 - adds r0, r4, 0 - movs r1, 0x40 - bl GetMonData - add r2, sp, 0x4 - strb r0, [r2] - ldr r3, _080A2E50 @ =gSaveBlock1 - ldrb r1, [r2] - lsls r0, r1, 3 - adds r0, r1 - lsls r0, 2 - adds r0, r3 - ldr r1, _080A2E54 @ =0x00002b6c - adds r0, r1 - movs r3, 0 - movs r1, 0 - strh r1, [r0] - movs r0, 0xFF - strb r0, [r2] - mov r0, sp - strb r3, [r0] - strb r3, [r0, 0x1] - adds r0, r4, 0 - movs r1, 0x40 - bl SetMonData - adds r0, r4, 0 - movs r1, 0xC - mov r2, sp - bl SetMonData -_080A2E46: - add sp, 0x8 - pop {r4} - pop {r0} - bx r0 - .align 2, 0 -_080A2E50: .4byte gSaveBlock1 -_080A2E54: .4byte 0x00002b6c - thumb_func_end sub_80A2DF8 - - thumb_func_start unref_sub_80A2E58 -unref_sub_80A2E58: @ 80A2E58 - lsls r0, 24 - lsrs r0, 24 - ldr r2, _080A2E70 @ =gSaveBlock1 - lsls r1, r0, 3 - adds r1, r0 - lsls r1, 2 - adds r1, r2 - ldr r0, _080A2E74 @ =0x00002b6c - adds r1, r0 - movs r0, 0 - strh r0, [r1] - bx lr - .align 2, 0 -_080A2E70: .4byte gSaveBlock1 -_080A2E74: .4byte 0x00002b6c - thumb_func_end unref_sub_80A2E58 - - thumb_func_start sub_80A2E78 -sub_80A2E78: @ 80A2E78 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - sub sp, 0xC - adds r5, r0, 0 - mov r0, sp - movs r1, 0 - strb r1, [r0] - strb r1, [r0, 0x1] - add r1, sp, 0x4 - movs r0, 0xFF - strb r0, [r1] - movs r7, 0x6 - mov r9, r1 - ldr r0, _080A2F04 @ =gSaveBlock1 - mov r8, r0 - ldr r2, _080A2F08 @ =0x00002b4c - add r2, r8 -_080A2E9E: - lsls r0, r7, 3 - adds r0, r7 - lsls r4, r0, 2 - mov r1, r8 - adds r0, r4, r1 - ldr r3, _080A2F0C @ =0x00002b6c - adds r0, r3 - ldrh r6, [r0] - cmp r6, 0 - bne _080A2F10 - adds r4, r2 - adds r0, r5, 0 - movs r1, 0x40 - str r2, [sp, 0x8] - bl GetMonData - lsls r1, r0, 3 - adds r1, r0 - lsls r1, 2 - ldr r2, [sp, 0x8] - adds r1, r2 - ldm r1!, {r0,r2,r3} - stm r4!, {r0,r2,r3} - ldm r1!, {r0,r2,r3} - stm r4!, {r0,r2,r3} - ldm r1!, {r0,r2,r3} - stm r4!, {r0,r2,r3} - adds r0, r5, 0 - movs r1, 0x40 - bl GetMonData - lsls r1, r0, 3 - adds r1, r0 - lsls r1, 2 - add r1, r8 - ldr r0, _080A2F0C @ =0x00002b6c - adds r1, r0 - strh r6, [r1] - adds r0, r5, 0 - movs r1, 0x40 - mov r2, r9 - bl SetMonData - adds r0, r5, 0 - movs r1, 0xC - mov r2, sp - bl SetMonData - adds r0, r7, 0 - b _080A2F1C - .align 2, 0 -_080A2F04: .4byte gSaveBlock1 -_080A2F08: .4byte 0x00002b4c -_080A2F0C: .4byte 0x00002b6c -_080A2F10: - adds r0, r7, 0x1 - lsls r0, 24 - lsrs r7, r0, 24 - cmp r7, 0xF - bls _080A2E9E - movs r0, 0xFF -_080A2F1C: - add sp, 0xC - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end sub_80A2E78 - - thumb_func_start itemid_is_mail -itemid_is_mail: @ 80A2F2C - push {lr} - lsls r0, 16 - lsrs r0, 16 - cmp r0, 0x84 - bgt _080A2F3E - cmp r0, 0x79 - blt _080A2F3E - movs r0, 0x1 - b _080A2F40 -_080A2F3E: - movs r0, 0 -_080A2F40: - pop {r1} - bx r1 - thumb_func_end itemid_is_mail - - .align 2, 0 @ Don't pad with nop. diff --git a/asm/menu_helpers.s b/asm/menu_helpers.s index 0b95b553e..f10070110 100644 --- a/asm/menu_helpers.s +++ b/asm/menu_helpers.s @@ -420,7 +420,7 @@ sub_80F931C: @ 80F931C cmp r0, 0x1 bne _080F933C adds r0, r4, 0 - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 diff --git a/asm/mystery_event_script.s b/asm/mystery_event_script.s index f0e842626..93abd97bc 100644 --- a/asm/mystery_event_script.s +++ b/asm/mystery_event_script.s @@ -677,13 +677,13 @@ _081266C6: bl GetMonData lsls r0, 16 lsrs r0, 16 - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 cmp r0, 0 beq _081266E4 adds r0, r7, 0 mov r1, sp - bl sub_80A2D88 + bl GiveMailToMon2 _081266E4: bl party_compaction bl CalculatePlayerPartyCount diff --git a/asm/party_menu.s b/asm/party_menu.s index f405d174a..534d4aaa4 100644 --- a/asm/party_menu.s +++ b/asm/party_menu.s @@ -5808,7 +5808,7 @@ _0806DBAC: adds r0, r7, r5 ldrb r4, [r0] adds r0, r1, 0 - bl itemid_is_mail + bl ItemIsMail adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -5841,7 +5841,7 @@ _0806DBF0: adds r0, r5, r7 ldrb r4, [r0, 0x6] adds r0, r1, 0 - bl itemid_is_mail + bl ItemIsMail adds r1, r0, 0 lsls r1, 24 lsrs r1, 24 @@ -5991,7 +5991,7 @@ _0806DD2C: .4byte gSpriteTemplate_837660C _0806DD30: .4byte gSprites _0806DD34: adds r0, r7, 0 - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 cmp r0, 0 beq _0806DD46 @@ -6321,7 +6321,7 @@ _0806DFAC: bl GetMonData lsls r0, 16 lsrs r0, 16 - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 cmp r0, 0 beq _0806DFD8 @@ -7486,14 +7486,14 @@ PartyMenuUpdateMonHeldItem: @ 806E904 lsls r1, 16 lsrs r4, r1, 16 adds r0, r4, 0 - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _0806E93C adds r0, r5, 0 adds r1, r4, 0 - bl sub_80A2BC4 + bl GiveMailToMon lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF @@ -7571,7 +7571,7 @@ PartyMenuTryGiveMonHeldItem: @ 806E964 cmp r2, 0 beq _0806EA44 adds r0, r2, 0 - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -7609,7 +7609,7 @@ _0806E9F0: movs r1, 0x5 bl CreateTask adds r0, r5, 0 - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 @@ -7631,7 +7631,7 @@ _0806EA44: movs r1, 0x1 bl RemoveBagItem adds r0, r5, 0 - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 cmp r0, 0 beq _0806EA66 @@ -7726,7 +7726,7 @@ PartyMenuTryGiveMonHeldItem_806EACC: @ 806EACC ldrh r1, [r4, 0x6] bl PartyMenuUpdateMonHeldItem ldrh r0, [r4, 0x6] - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 cmp r0, 0 beq _0806EB34 @@ -7923,9 +7923,9 @@ _0806ECB8: .4byte party_menu_link_mon_held_item_object _0806ECBC: ldr r0, [r5] adds r1, r4, 0 - bl sub_80A2D88 + bl GiveMailToMon2 adds r0, r4, 0 - bl sub_80A2B40 + bl ClearMailStruct ldr r0, _0806ECE0 @ =gOtherText_MailTransferredMailbox movs r1, 0x1 bl sub_806E834 @@ -7997,13 +7997,13 @@ _0806ED50: cmp r0, 0x1 bne _0806ED92 adds r0, r4, 0 - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 lsrs r0, 24 cmp r0, 0x1 bne _0806ED7C ldr r0, [r5] - bl sub_80A2DF8 + bl TakeMailFromMon _0806ED7C: ldrb r0, [r5, 0x5] adds r1, r6, 0 @@ -8126,7 +8126,7 @@ Task_LoseMailMessage: @ 806EE5C cmp r0, 0x1 bne _0806EE98 ldr r0, [r5] - bl sub_80A2DF8 + bl TakeMailFromMon ldr r0, _0806EE94 @ =gOtherText_MailTaken movs r1, 0 bl sub_806E834 @@ -8235,7 +8235,7 @@ Task_TakeHeldMail: @ 806EF38 bl MenuZeroFillWindowRect ldr r0, _0806EF70 @ =0x0201c000 ldr r0, [r0] - bl sub_80A2E78 + bl TakeMailFromMon2 lsls r0, 24 lsrs r0, 24 cmp r0, 0xFF diff --git a/asm/player_pc.s b/asm/player_pc.s index 42edeba49..5e2adb775 100644 --- a/asm/player_pc.s +++ b/asm/player_pc.s @@ -1076,7 +1076,7 @@ _0813B5CC: movs r3, 0 bl DisplayItemMessageOnField adds r0, r6, 0 - bl sub_80A2B40 + bl ClearMailStruct bl sub_813AF78 ldrb r0, [r4, 0x3] subs r0, 0x1 diff --git a/asm/pokeblock.s b/asm/pokeblock.s index 55bc29dc5..44ac16b7e 100644 --- a/asm/pokeblock.s +++ b/asm/pokeblock.s @@ -2320,8 +2320,8 @@ _0810C944: _0810C94C: .4byte SpriteCallbackDummy thumb_func_end sub_810C8D4 - thumb_func_start sub_810C950 -sub_810C950: @ 810C950 + thumb_func_start ClearPokeblock +ClearPokeblock: @ 810C950 lsls r0, 24 ldr r1, _0810C988 @ =gSaveBlock1 lsrs r0, 21 @@ -2354,15 +2354,15 @@ sub_810C950: @ 810C950 _0810C988: .4byte gSaveBlock1 _0810C98C: .4byte 0x000007f9 _0810C990: .4byte 0x000007fe - thumb_func_end sub_810C950 + thumb_func_end ClearPokeblock - thumb_func_start sub_810C994 -sub_810C994: @ 810C994 + thumb_func_start ClearPokeblocks +ClearPokeblocks: @ 810C994 push {r4,lr} movs r4, 0 _0810C998: adds r0, r4, 0 - bl sub_810C950 + bl ClearPokeblock adds r0, r4, 0x1 lsls r0, 24 lsrs r4, r0, 24 @@ -2371,7 +2371,7 @@ _0810C998: pop {r4} pop {r0} bx r0 - thumb_func_end sub_810C994 + thumb_func_end ClearPokeblocks thumb_func_start sub_810C9B0 sub_810C9B0: @ 810C9B0 @@ -2499,7 +2499,7 @@ sub_810CA6C: @ 810CA6C cmp r0, 0 beq _0810CA94 adds r0, r2, 0 - bl sub_810C950 + bl ClearPokeblock movs r0, 0x1 b _0810CA96 .align 2, 0 diff --git a/asm/pokemon_icon.s b/asm/pokemon_icon.s index a63779b28..5aa8b5901 100644 --- a/asm/pokemon_icon.s +++ b/asm/pokemon_icon.s @@ -228,7 +228,7 @@ mon_icon_convert_unown_species_id: @ 809D434 cmp r2, SPECIES_UNOWN bne _0809D45E adds r0, r1, 0 - bl sub_809D474 + bl GetUnownLetterByPersonality lsls r0, 16 lsrs r0, 16 cmp r0, 0 @@ -258,8 +258,8 @@ _0809D46C: bx r1 thumb_func_end mon_icon_convert_unown_species_id - thumb_func_start sub_809D474 -sub_809D474: @ 809D474 + thumb_func_start GetUnownLetterByPersonality +GetUnownLetterByPersonality: @ 809D474 push {lr} adds r2, r0, 0 movs r0, 0xC0 @@ -285,7 +285,7 @@ sub_809D474: @ 809D474 lsrs r0, 16 pop {r1} bx r1 - thumb_func_end sub_809D474 + thumb_func_end GetUnownLetterByPersonality thumb_func_start sub_809D4A8 sub_809D4A8: @ 809D4A8 @@ -295,7 +295,7 @@ sub_809D4A8: @ 809D4A8 lsrs r4, r0, 16 adds r0, r4, 0 mov r1, sp - bl sub_80A2D64 + bl MailSpeciesToSpecies lsls r0, 16 lsrs r0, 16 cmp r0, SPECIES_UNOWN diff --git a/asm/pokemon_menu.s b/asm/pokemon_menu.s index 2f1c16f8c..57bcd4904 100644 --- a/asm/pokemon_menu.s +++ b/asm/pokemon_menu.s @@ -143,7 +143,7 @@ _08089B76: bl GetMonData lsls r0, 16 lsrs r0, 16 - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 cmp r0, 0 beq _08089BB4 @@ -964,7 +964,7 @@ sub_808A228: @ 808A228 lsrs r4, r0, 24 ldr r0, _0808A268 @ =gScriptItemId ldrh r0, [r0] - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 cmp r0, 0 beq _0808A278 @@ -1188,7 +1188,7 @@ sub_808A3F8: @ 808A3F8 push {r4,lr} ldr r0, _0808A460 @ =gScriptItemId ldrh r0, [r0] - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 cmp r0, 0 beq _0808A47E @@ -1349,7 +1349,7 @@ _0808A542: ldrb r0, [r6] muls r0, r5 adds r0, r4 - bl sub_80A2DF8 + bl TakeMailFromMon ldrb r0, [r6] muls r0, r5 adds r0, r4 @@ -3202,7 +3202,7 @@ _0808B416: ldrb r0, [r6] muls r0, r5 adds r0, r4 - bl sub_80A2DF8 + bl TakeMailFromMon ldrb r0, [r6] muls r0, r5 adds r0, r4 diff --git a/asm/pokemon_storage_system.s b/asm/pokemon_storage_system.s index 89f0e2865..176a42124 100644 --- a/asm/pokemon_storage_system.s +++ b/asm/pokemon_storage_system.s @@ -1186,8 +1186,8 @@ _080961D0: .4byte sub_8096130 _080961D4: .4byte c2_exit_to_overworld_2_switch thumb_func_end sub_80961A8 - thumb_func_start sub_80961D8 -sub_80961D8: @ 80961D8 + thumb_func_start ResetPokemonStorageSystem +ResetPokemonStorageSystem: @ 80961D8 push {r4-r7,lr} ldr r1, _08096258 @ =gPokemonStorage movs r0, 0 @@ -1256,7 +1256,7 @@ _0809623E: _08096258: .4byte gPokemonStorage _0809625C: .4byte gPokemonStorage + 0x8344 _08096260: .4byte gPCText_BOX - thumb_func_end sub_80961D8 + thumb_func_end ResetPokemonStorageSystem thumb_func_start sub_8096264 sub_8096264: @ 8096264 @@ -2620,7 +2620,7 @@ _08096D66: ldr r1, _08096D8C @ =0x000011f2 adds r0, r4, r1 ldrh r0, [r0] - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 cmp r0, 0 bne _08096E4C @@ -2712,7 +2712,7 @@ _08096E30: ldr r1, _08096E58 @ =0x000011f2 adds r0, r4, r1 ldrh r0, [r0] - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 cmp r0, 0 beq _08096E5C @@ -3102,7 +3102,7 @@ _08097190: ldr r1, _080971C4 @ =0x000011f2 adds r0, r4, r1 ldrh r0, [r0] - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 cmp r0, 0 bne _08097210 @@ -3145,7 +3145,7 @@ _08097200: ldr r1, _08097218 @ =0x000011f2 adds r0, r4, r1 ldrh r0, [r0] - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 cmp r0, 0 beq _0809721C @@ -5891,196 +5891,7 @@ _08098892: bx r1 thumb_func_end sub_8098830 - thumb_func_start sub_8098898 -sub_8098898: @ 8098898 - push {r4-r6,lr} - lsls r0, 24 - lsrs r5, r0, 24 - movs r0, 0xA - movs r1, 0x10 - movs r2, 0x1D - movs r3, 0x13 - bl MenuDrawTextWindow - ldr r1, _080988C4 @ =gUnknown_083B6DF4 - lsls r0, r5, 3 - adds r0, r1 - ldrb r0, [r0, 0x4] - cmp r0, 0x6 - bls _080988B8 - b _080989F4 -_080988B8: - lsls r0, 2 - ldr r1, _080988C8 @ =_080988CC - adds r0, r1 - ldr r0, [r0] - mov pc, r0 - .align 2, 0 -_080988C4: .4byte gUnknown_083B6DF4 -_080988C8: .4byte _080988CC - .align 2, 0 -_080988CC: - .4byte _080989F4 - .4byte _08098930 - .4byte _080988E8 - .4byte _08098974 - .4byte _08098954 - .4byte _08098910 - .4byte _080989B8 -_080988E8: - ldr r4, _08098904 @ =0x02002694 - ldr r1, _08098908 @ =gUnknown_083B6DF4 - lsls r0, r5, 3 - adds r0, r1 - ldr r1, [r0] - adds r0, r4, 0 - bl StringCopy - adds r2, r0, 0 - ldr r0, _0809890C @ =0xffffeb66 - adds r4, r0 - adds r0, r2, 0 - adds r1, r4, 0 - b _080989FE - .align 2, 0 -_08098904: .4byte 0x02002694 -_08098908: .4byte gUnknown_083B6DF4 -_0809890C: .4byte 0xffffeb66 -_08098910: - ldr r4, _08098928 @ =0x02002694 - ldr r1, _0809892C @ =gUnknown_083B6DF4 - lsls r0, r5, 3 - adds r0, r1 - ldr r1, [r0] - adds r0, r4, 0 - bl StringCopy - adds r2, r0, 0 - adds r4, 0x50 - adds r1, r4, 0 - b _080989FE - .align 2, 0 -_08098928: .4byte 0x02002694 -_0809892C: .4byte gUnknown_083B6DF4 -_08098930: - ldr r0, _08098948 @ =0x02002694 - ldr r2, _0809894C @ =0xffffeb66 - adds r1, r0, r2 - bl StringCopy - adds r2, r0, 0 - ldr r1, _08098950 @ =gUnknown_083B6DF4 - lsls r0, r5, 3 - adds r0, r1 - ldr r1, [r0] - adds r0, r2, 0 - b _080989FE - .align 2, 0 -_08098948: .4byte 0x02002694 -_0809894C: .4byte 0xffffeb66 -_08098950: .4byte gUnknown_083B6DF4 -_08098954: - ldr r0, _0809896C @ =0x02002694 - adds r1, r0, 0 - adds r1, 0x50 - bl StringCopy - adds r2, r0, 0 - ldr r1, _08098970 @ =gUnknown_083B6DF4 - lsls r0, r5, 3 - adds r0, r1 - ldr r1, [r0] - adds r0, r2, 0 - b _080989FE - .align 2, 0 -_0809896C: .4byte 0x02002694 -_08098970: .4byte gUnknown_083B6DF4 -_08098974: - ldr r1, _080989AC @ =gUnknown_083B6DF4 - lsls r0, r5, 3 - adds r0, r1 - ldr r6, [r0] - adds r0, r6, 0 - bl StringLength - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - adds r4, r6, r4 - adds r4, 0x1 - ldr r5, _080989B0 @ =0x02002694 - adds r0, r5, 0 - adds r1, r6, 0 - bl StringCopy - adds r2, r0, 0 - ldr r0, _080989B4 @ =0xffffeb66 - adds r5, r0 - adds r0, r2, 0 - adds r1, r5, 0 - bl StringCopy - adds r2, r0, 0 - adds r1, r4, 0 - b _080989FE - .align 2, 0 -_080989AC: .4byte gUnknown_083B6DF4 -_080989B0: .4byte 0x02002694 -_080989B4: .4byte 0xffffeb66 -_080989B8: - ldr r1, _080989EC @ =gUnknown_083B6DF4 - lsls r0, r5, 3 - adds r0, r1 - ldr r6, [r0] - adds r0, r6, 0 - bl StringLength - adds r4, r0, 0 - lsls r4, 16 - lsrs r4, 16 - adds r4, r6, r4 - subs r4, 0x1 - ldr r5, _080989F0 @ =0x02002694 - adds r0, r5, 0 - adds r1, r6, 0 - bl StringCopy - adds r2, r0, 0 - subs r0, r2, 0x1 - adds r5, 0x50 - adds r1, r5, 0 - bl StringCopy - adds r2, r0, 0 - adds r1, r4, 0 - b _080989FE - .align 2, 0 -_080989EC: .4byte gUnknown_083B6DF4 -_080989F0: .4byte 0x02002694 -_080989F4: - ldr r0, _08098A2C @ =0x02002694 - ldr r2, _08098A30 @ =gUnknown_083B6DF4 - lsls r1, r5, 3 - adds r1, r2 - ldr r1, [r1] -_080989FE: - bl StringCopy - adds r2, r0, 0 - ldr r0, _08098A34 @ =0x020026a6 - adds r3, r0, 0 - subs r3, 0x12 - cmp r2, r0 - bcs _08098A18 - movs r1, 0 -_08098A10: - strb r1, [r2] - adds r2, 0x1 - cmp r2, r0 - bcc _08098A10 -_08098A18: - movs r0, 0xFF - strb r0, [r2] - adds r0, r3, 0 - movs r1, 0xB - movs r2, 0x11 - bl MenuPrint - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_08098A2C: .4byte 0x02002694 -_08098A30: .4byte gUnknown_083B6DF4 -_08098A34: .4byte 0x020026a6 - thumb_func_end sub_8098898 +.section .text_8098A38 thumb_func_start sub_8098A38 sub_8098A38: @ 8098A38 diff --git a/asm/pokenav.s b/asm/pokenav.s index 966285ab3..757a2a5a2 100644 --- a/asm/pokenav.s +++ b/asm/pokenav.s @@ -22849,67 +22849,7 @@ sub_80F6FFC: @ 80F6FFC _080F7008: .4byte REG_BLDCNT thumb_func_end sub_80F6FFC - thumb_func_start sub_80F700C -sub_80F700C: @ 80F700C - push {r4,r5,lr} - lsls r1, 16 - lsrs r1, 16 - ldr r2, _080F7078 @ =gUnknown_083DFEC4 - ldr r4, [r2] - lsls r2, r1, 3 - adds r2, r4, r2 - ldr r3, _080F707C @ =0x0000cee8 - adds r2, r3 - ldrh r3, [r2] - lsls r2, r3, 2 - adds r2, r3 - lsls r2, 3 - ldr r3, _080F7080 @ =gTrainers - adds r5, r2, r3 - adds r3, r0, 0 - ldr r0, _080F7084 @ =0x0000d158 - adds r4, r0 - ldrh r4, [r4] - cmp r1, r4 - bcs _080F7060 - ldrb r1, [r5, 0x1] - movs r0, 0xD - muls r1, r0 - ldr r0, _080F7088 @ =gTrainerClassNames - adds r1, r0 - adds r0, r3, 0 - bl StringCopy - adds r3, r0, 0 - movs r0, 0xFC - strb r0, [r3] - movs r0, 0x13 - strb r0, [r3, 0x1] - movs r0, 0x4B - strb r0, [r3, 0x2] - adds r3, 0x3 - adds r1, r5, 0x4 - adds r0, r3, 0 - bl StringCopy - adds r3, r0, 0 -_080F7060: - movs r0, 0xFC - strb r0, [r3] - movs r0, 0x13 - strb r0, [r3, 0x1] - movs r0, 0x80 - strb r0, [r3, 0x2] - movs r0, 0xFF - strb r0, [r3, 0x3] - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_080F7078: .4byte gUnknown_083DFEC4 -_080F707C: .4byte 0x0000cee8 -_080F7080: .4byte gTrainers -_080F7084: .4byte 0x0000d158 -_080F7088: .4byte gTrainerClassNames - thumb_func_end sub_80F700C +.section .text_80F708C thumb_func_start sub_80F708C sub_80F708C: @ 80F708C diff --git a/asm/region_map.s b/asm/region_map.s index 8113afe64..44d6a4e91 100644 --- a/asm/region_map.s +++ b/asm/region_map.s @@ -1759,7 +1759,7 @@ sub_80FB600: @ 80FB600 adds r1, r4, 0 adds r2, r5, 0 adds r3, r6, 0 - bl sub_810D9EC + bl GetSSTidalLocation lsls r0, 24 lsrs r0, 24 mov r10, r5 diff --git a/asm/rom5.s b/asm/reshow_battle_screen.s index 93f73dca8..88fa5dbde 100644 --- a/asm/rom5.s +++ b/asm/reshow_battle_screen.s @@ -11,8 +11,8 @@ nullsub_14: @ 807AD54 bx lr thumb_func_end nullsub_14 - thumb_func_start sub_807AD58 -sub_807AD58: @ 807AD58 + thumb_func_start ReshowBattleScreenAfterMenu +ReshowBattleScreenAfterMenu: @ 807AD58 push {lr} ldr r2, _0807AD90 @ =gPaletteFade ldrb r0, [r2, 0x8] @@ -33,7 +33,7 @@ sub_807AD58: @ 807AD58 ldr r1, _0807ADA0 @ =0x0001fffe adds r0, r1 strb r2, [r0] - ldr r0, _0807ADA4 @ =sub_807ADA8 + ldr r0, _0807ADA4 @ =CB2_ReshowBattleScreenAfterMenu bl SetMainCallback2 pop {r0} bx r0 @@ -43,11 +43,11 @@ _0807AD94: .4byte REG_MOSAIC _0807AD98: .4byte 0x02000000 _0807AD9C: .4byte 0x0001ffff _0807ADA0: .4byte 0x0001fffe -_0807ADA4: .4byte sub_807ADA8 - thumb_func_end sub_807AD58 +_0807ADA4: .4byte CB2_ReshowBattleScreenAfterMenu + thumb_func_end ReshowBattleScreenAfterMenu - thumb_func_start sub_807ADA8 -sub_807ADA8: @ 807ADA8 + thumb_func_start CB2_ReshowBattleScreenAfterMenu +CB2_ReshowBattleScreenAfterMenu: @ 807ADA8 push {r4-r7,lr} sub sp, 0x8 ldr r0, _0807ADC4 @ =0x02000000 @@ -352,7 +352,7 @@ _0807B05C: .4byte gPaletteFade _0807B060: .4byte sub_800F808 _0807B064: .4byte 0x02000000 _0807B068: .4byte 0x0001ffff - thumb_func_end sub_807ADA8 + thumb_func_end CB2_ReshowBattleScreenAfterMenu thumb_func_start sub_807B06C sub_807B06C: @ 807B06C diff --git a/asm/secret_base.s b/asm/secret_base.s index bfa0e573d..81225ba4b 100644 --- a/asm/secret_base.s +++ b/asm/secret_base.s @@ -131,8 +131,8 @@ _080BB54C: bx r0 thumb_func_end sub_80BB4AC - thumb_func_start sub_80BB594 -sub_80BB594: @ 80BB594 + thumb_func_start ResetSecretBase +ResetSecretBase: @ 80BB594 push {lr} adds r1, r0, 0 lsls r1, 24 @@ -147,16 +147,16 @@ sub_80BB594: @ 80BB594 bx r0 .align 2, 0 _080BB5B0: .4byte gSaveBlock1 + 0x1A08 - thumb_func_end sub_80BB594 + thumb_func_end ResetSecretBase - thumb_func_start sub_80BB5B4 -sub_80BB5B4: @ 80BB5B4 + thumb_func_start ResetSecretBases +ResetSecretBases: @ 80BB5B4 push {r4,lr} movs r4, 0 _080BB5B8: lsls r0, r4, 24 lsrs r0, 24 - bl sub_80BB594 + bl ResetSecretBase adds r0, r4, 0x1 lsls r0, 16 lsrs r4, r0, 16 @@ -165,7 +165,7 @@ _080BB5B8: pop {r4} pop {r0} bx r0 - thumb_func_end sub_80BB5B4 + thumb_func_end ResetSecretBases thumb_func_start sub_80BB5D0 sub_80BB5D0: @ 80BB5D0 @@ -1701,37 +1701,7 @@ _080BC18A: bx r1 thumb_func_end sub_80BC14C - thumb_func_start sub_80BC190 -sub_80BC190: @ 80BC190 - push {r4,r5,lr} - adds r5, r0, 0 - lsls r1, 24 - lsrs r1, 24 - lsls r4, r1, 2 - adds r4, r1 - lsls r4, 5 - ldr r0, _080BC1C8 @ =gSaveBlock1 + 0x1A0A - adds r4, r0 - adds r0, r4, 0 - bl sub_80BB8A8 - adds r2, r0, 0 - lsls r2, 24 - lsrs r2, 24 - adds r0, r5, 0 - adds r1, r4, 0 - bl StringCopyN - movs r1, 0xFF - strb r1, [r0] - ldr r1, _080BC1CC @ =gOtherText_PlayersBase - adds r0, r5, 0 - bl StringAppend - pop {r4,r5} - pop {r1} - bx r1 - .align 2, 0 -_080BC1C8: .4byte gSaveBlock1 + 0x1A0A -_080BC1CC: .4byte gOtherText_PlayersBase - thumb_func_end sub_80BC190 +.section .text_80BC1D0 thumb_func_start GetSecretBaseMapName GetSecretBaseMapName: @ 80BC1D0 @@ -2043,7 +2013,7 @@ sub_80BC440: @ 80BC440 adds r4, r0 ldrh r5, [r4] movs r0, 0 - bl sub_80BB594 + bl ResetSecretBase strh r5, [r4] bl sub_80BC0F8 pop {r4,r5} @@ -2155,7 +2125,7 @@ sub_80BC50C: @ 80BC50C adds r4, r0 ldrh r5, [r4] movs r0, 0 - bl sub_80BB594 + bl ResetSecretBase strh r5, [r4] pop {r4,r5} pop {r0} diff --git a/asm/slot_machine.s b/asm/slot_machine.s index 32abb287d..46af5bc0f 100644 --- a/asm/slot_machine.s +++ b/asm/slot_machine.s @@ -7048,72 +7048,7 @@ _08104CA4: .4byte gTasks _08104CA8: .4byte 0x0000ffff thumb_func_end sub_8104C5C - thumb_func_start sub_8104CAC -sub_8104CAC: @ 8104CAC - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r4, r0, 0 - lsls r4, 24 - lsrs r4, 24 - bl sub_8104DA4 - ldr r0, _08104D24 @ =0x02000000 - adds r0, 0x3D - ldrb r1, [r0] - lsls r0, r1, 2 - adds r0, r1 - lsls r0, 3 - ldr r1, _08104D28 @ =gTasks - adds r7, r0, r1 - strh r4, [r7, 0xA] - movs r6, 0 - ldr r1, _08104D2C @ =gUnknown_083ED048 - lsls r5, r4, 2 - adds r0, r5, r1 - ldr r0, [r0] - ldrb r0, [r0] - cmp r0, 0xFF - beq _08104D18 - mov r8, r1 -_08104CE0: - mov r0, r8 - adds r4, r5, r0 - ldr r0, [r4] - lsls r2, r6, 2 - adds r2, r0 - ldrb r0, [r2] - ldrb r1, [r2, 0x1] - movs r3, 0x2 - ldrsh r2, [r2, r3] - bl sub_8105BB4 - lsls r0, 24 - lsrs r0, 24 - adds r2, r6, 0x4 - lsls r2, 1 - adds r1, r7, 0 - adds r1, 0x8 - adds r1, r2 - strh r0, [r1] - adds r0, r6, 0x1 - lsls r0, 24 - lsrs r6, r0, 24 - ldr r1, [r4] - lsls r0, r6, 2 - adds r0, r1 - ldrb r0, [r0] - cmp r0, 0xFF - bne _08104CE0 -_08104D18: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_08104D24: .4byte 0x02000000 -_08104D28: .4byte gTasks -_08104D2C: .4byte gUnknown_083ED048 - thumb_func_end sub_8104CAC +.section .text_8104D30 thumb_func_start sub_8104D30 sub_8104D30: @ 8104D30 @@ -10221,249 +10156,4 @@ _08106440: .4byte gUnknown_083EDCDC _08106444: .4byte gUnknown_083EDCE4 thumb_func_end sub_8106404 - thumb_func_start sub_8106448 -sub_8106448: @ 8106448 - push {r4-r7,lr} - ldr r0, _081064A0 @ =gSlotMachine_Gfx - ldr r4, _081064A4 @ =0x02010000 - adds r1, r4, 0 - bl sub_800D238 - movs r3, 0xC0 - lsls r3, 19 - movs r5, 0xE9 - lsls r5, 5 - ldr r1, _081064A8 @ =0x040000d4 - ldr r6, _081064AC @ =0x80000800 - movs r2, 0x80 - lsls r2, 5 - movs r7, 0x80 - lsls r7, 24 -_08106468: - str r4, [r1] - str r3, [r1, 0x4] - str r6, [r1, 0x8] - ldr r0, [r1, 0x8] - adds r4, r2 - adds r3, r2 - subs r5, r2 - cmp r5, r2 - bhi _08106468 - str r4, [r1] - str r3, [r1, 0x4] - lsrs r0, r5, 1 - orrs r0, r7 - str r0, [r1, 0x8] - ldr r0, [r1, 0x8] - ldr r0, _081064B0 @ =gUnknown_08E95A18 - movs r1, 0 - movs r2, 0xA0 - bl LoadPalette - ldr r0, _081064B4 @ =gPalette_83EDE24 - movs r1, 0xD0 - movs r2, 0x20 - bl LoadPalette - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_081064A0: .4byte gSlotMachine_Gfx -_081064A4: .4byte 0x02010000 -_081064A8: .4byte 0x040000d4 -_081064AC: .4byte 0x80000800 -_081064B0: .4byte gUnknown_08E95A18 -_081064B4: .4byte gPalette_83EDE24 - thumb_func_end sub_8106448 - - thumb_func_start sub_81064B8 -sub_81064B8: @ 81064B8 - push {lr} - ldr r0, _081064D0 @ =gUnknown_08E95AB8 - ldr r1, _081064D4 @ =0x0600e800 - movs r2, 0xA0 - lsls r2, 2 - bl CpuSet - bl sub_81064D8 - pop {r0} - bx r0 - .align 2, 0 -_081064D0: .4byte gUnknown_08E95AB8 -_081064D4: .4byte 0x0600e800 - thumb_func_end sub_81064B8 - - thumb_func_start sub_81064D8 -sub_81064D8: @ 81064D8 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - ldr r6, _0810658C @ =0x0600f000 - movs r3, 0x4 - movs r0, 0xC0 - lsls r0, 1 - mov r12, r0 - movs r1, 0xC0 - lsls r1, 2 - mov r9, r1 - movs r2, 0xA0 - lsls r2, 1 - mov r8, r2 -_081064F6: - movs r0, 0 - lsls r4, r3, 16 - asrs r5, r4, 16 -_081064FC: - lsls r2, r0, 16 - asrs r2, 16 - adds r1, r5, r2 - lsls r1, 1 - adds r1, r6 - mov r7, r8 - adds r3, r1, r7 - ldr r7, _08106590 @ =0x00002051 - adds r0, r7, 0 - strh r0, [r3] - movs r0, 0xD0 - lsls r0, 2 - adds r3, r1, r0 - ldr r7, _08106594 @ =0x00002851 - adds r0, r7, 0 - strh r0, [r3] - mov r0, r12 - adds r3, r1, r0 - ldr r7, _08106598 @ =0x00002061 - adds r0, r7, 0 - strh r0, [r3] - add r1, r9 - ldr r3, _0810659C @ =0x00002861 - adds r0, r3, 0 - strh r0, [r1] - adds r2, 0x1 - lsls r2, 16 - lsrs r0, r2, 16 - asrs r2, 16 - cmp r2, 0x3 - ble _081064FC - asrs r3, r4, 16 - lsls r1, r3, 1 - adds r1, r6 - mov r5, r12 - adds r2, r1, r5 - adds r7, 0x5D - adds r0, r7, 0 - strh r0, [r2] - add r1, r9 - ldr r2, _081065A0 @ =0x000028be - adds r0, r2, 0 - strh r0, [r1] - movs r0, 0x7 - ldr r5, _081065A4 @ =0x000020bf - adds r2, r5, 0 -_08106558: - lsls r1, r0, 16 - asrs r1, 16 - lsls r0, r1, 5 - adds r0, r3 - lsls r0, 1 - adds r0, r6 - strh r2, [r0] - adds r1, 0x1 - lsls r1, 16 - lsrs r0, r1, 16 - asrs r1, 16 - cmp r1, 0xB - ble _08106558 - movs r7, 0xA0 - lsls r7, 11 - adds r0, r4, r7 - lsrs r3, r0, 16 - asrs r0, 16 - cmp r0, 0x11 - ble _081064F6 - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_0810658C: .4byte 0x0600f000 -_08106590: .4byte 0x00002051 -_08106594: .4byte 0x00002851 -_08106598: .4byte 0x00002061 -_0810659C: .4byte 0x00002861 -_081065A0: .4byte 0x000028be -_081065A4: .4byte 0x000020bf - thumb_func_end sub_81064D8 - - thumb_func_start sub_81065A8 -sub_81065A8: @ 81065A8 - push {r4-r6,lr} - ldr r5, [sp, 0x10] - lsls r0, 16 - asrs r0, 15 - ldr r6, _081065D0 @ =0x0600ebc0 - adds r4, r0, r6 - strh r1, [r4] - ldr r4, _081065D4 @ =0x0600ebc2 - adds r1, r0, r4 - strh r2, [r1] - adds r6, 0x40 - adds r1, r0, r6 - strh r3, [r1] - ldr r1, _081065D8 @ =0x0600ec02 - adds r0, r1 - strh r5, [r0] - pop {r4-r6} - pop {r0} - bx r0 - .align 2, 0 -_081065D0: .4byte 0x0600ebc0 -_081065D4: .4byte 0x0600ebc2 -_081065D8: .4byte 0x0600ec02 - thumb_func_end sub_81065A8 - - thumb_func_start sub_81065DC -sub_81065DC: @ 81065DC - push {r4,r5,lr} - ldr r0, _08106624 @ =gUnknown_08E95FB8 - ldr r1, _08106628 @ =0x0600e800 - movs r2, 0xA0 - lsls r2, 2 - bl CpuSet - ldr r5, _0810662C @ =0x0600f000 - movs r1, 0 - movs r4, 0 -_081065F0: - movs r0, 0 - lsls r3, r1, 16 - asrs r2, r3, 11 -_081065F6: - lsls r1, r0, 16 - asrs r1, 16 - adds r0, r2, r1 - lsls r0, 1 - adds r0, r5 - strh r4, [r0] - adds r1, 0x1 - lsls r1, 16 - lsrs r0, r1, 16 - asrs r1, 16 - cmp r1, 0x1D - ble _081065F6 - movs r1, 0x80 - lsls r1, 9 - adds r0, r3, r1 - lsrs r1, r0, 16 - asrs r0, 16 - cmp r0, 0x13 - ble _081065F0 - pop {r4,r5} - pop {r0} - bx r0 - .align 2, 0 -_08106624: .4byte gUnknown_08E95FB8 -_08106628: .4byte 0x0600e800 -_0810662C: .4byte 0x0600f000 - thumb_func_end sub_81065DC - .align 2, 0 @ Don't pad with nop. diff --git a/asm/trade.s b/asm/trade.s index d1fe82d6c..756423ee7 100644 --- a/asm/trade.s +++ b/asm/trade.s @@ -7639,7 +7639,7 @@ sub_804BA94: @ 804BA94 lsls r0, 2 ldr r1, _0804BB68 @ =gSaveBlock1 + 0x2B4C adds r0, r1 - bl sub_80A2B40 + bl ClearMailStruct _0804BAE8: ldr r4, _0804BB6C @ =gUnknown_03004828 ldr r0, [r4] @@ -7678,7 +7678,7 @@ _0804BB28: ldr r0, _0804BB70 @ =gUnknown_02029700 adds r1, r0 adds r0, r7, 0 - bl sub_80A2D88 + bl GiveMailToMon2 _0804BB3E: mov r0, r9 bl sub_804BA18 @@ -11262,7 +11262,7 @@ sub_804D948: @ 804D948 ldrh r0, [r5, 0x28] cmp r0, 0 beq _0804DAC0 - bl itemid_is_mail + bl ItemIsMail lsls r0, 24 cmp r0, 0 beq _0804DAB4 @@ -7,8 +7,8 @@ .text - thumb_func_start sub_80BD7A8 -sub_80BD7A8: @ 80BD7A8 + thumb_func_start ClearTVShowData +ClearTVShowData: @ 80BD7A8 push {r4-r7,lr} movs r3, 0 ldr r6, _080BD7F0 @ =gSaveBlock1 @@ -50,7 +50,7 @@ _080BD7F0: .4byte gSaveBlock1 _080BD7F4: .4byte 0x0000273a _080BD7F8: .4byte 0x00002738 _080BD7FC: .4byte 0x00002739 - thumb_func_end sub_80BD7A8 + thumb_func_end ClearTVShowData thumb_func_start special_0x44 special_0x44: @ 80BD800 @@ -417,8 +417,8 @@ _080BDAAE: bx r1 thumb_func_end special_0x4a - thumb_func_start sub_80BDAB4 -sub_80BDAB4: @ 80BDAB4 + thumb_func_start ResetGabbyAndTy +ResetGabbyAndTy: @ 80BDAB4 push {r4,lr} ldr r2, _080BDAF8 @ =gSaveBlock1 ldr r1, _080BDAFC @ =0x00002b10 @@ -461,7 +461,7 @@ _080BDB04: .4byte 0x00002b16 _080BDB08: .4byte 0x0000ffff _080BDB0C: .4byte 0x00002b1b _080BDB10: .4byte 0x00002b18 - thumb_func_end sub_80BDAB4 + thumb_func_end ResetGabbyAndTy thumb_func_start GabbyAndTyBeforeInterview GabbyAndTyBeforeInterview: @ 80BDB14 |