diff options
Diffstat (limited to 'asm')
| -rw-r--r-- | asm/battle_2.s | 32 | ||||
| -rwxr-xr-x | asm/pc_screen_effect.s | 179 |
2 files changed, 16 insertions, 195 deletions
diff --git a/asm/battle_2.s b/asm/battle_2.s index d15bc6826..b325276fc 100644 --- a/asm/battle_2.s +++ b/asm/battle_2.s @@ -2591,7 +2591,7 @@ _080137FA: lsls r0, 29 cmp r0, 0 blt _0801387C - ldr r0, _08013878 @ =gUnknown_081D94DA + ldr r0, _08013878 @ =BattleScript_FocusPunchSetUp bl b_call_bc_move_exec b _080138BE .align 2, 0 @@ -2605,7 +2605,7 @@ _08013868: .4byte gChosenMovesByBanks _0801386C: .4byte gBattleMons _08013870: .4byte gDisableStructs _08013874: .4byte gProtectStructs -_08013878: .4byte gUnknown_081D94DA +_08013878: .4byte BattleScript_FocusPunchSetUp _0801387C: ldrb r0, [r4] ldrb r2, [r7] @@ -4414,7 +4414,7 @@ sub_80147A0: @ 80147A0 cmp r3, 0xC bhi _08014830 ldr r2, _08014828 @ =gBattlescriptCurrInstr - ldr r1, _0801482C @ =gUnknown_081D9E48 + ldr r1, _0801482C @ =gBattlescriptsForBallThrow ldrh r0, [r5] lsls r0, 2 adds r0, r1 @@ -4432,7 +4432,7 @@ _0801481C: .4byte gDisableStructs _08014820: .4byte gLastUsedItem _08014824: .4byte gBattleBufferB _08014828: .4byte gBattlescriptCurrInstr -_0801482C: .4byte gUnknown_081D9E48 +_0801482C: .4byte gBattlescriptsForBallThrow _08014830: adds r0, r3, 0 subs r0, 0x50 @@ -4441,11 +4441,11 @@ _08014830: cmp r0, 0x1 bhi _0801484C ldr r0, _08014844 @ =gBattlescriptCurrInstr - ldr r1, _08014848 @ =gUnknown_081D9E94 + ldr r1, _08014848 @ =gBattlescriptsForRunningByItem b _0801485C .align 2, 0 _08014844: .4byte gBattlescriptCurrInstr -_08014848: .4byte gUnknown_081D9E94 +_08014848: .4byte gBattlescriptsForRunningByItem _0801484C: ldrb r0, [r4] bl GetBankSide @@ -5071,7 +5071,7 @@ sub_8014D50: @ 8014D50 ldr r0, _08014D88 @ =gUnknown_030042A0 strh r1, [r0] ldr r1, _08014D8C @ =gBattlescriptCurrInstr - ldr r0, _08014D90 @ =gUnknown_081D9E98 + ldr r0, _08014D90 @ =gBattlescriptsForSafariActions ldr r0, [r0] str r0, [r1] ldr r1, _08014D94 @ =gFightStateTracker @@ -5085,7 +5085,7 @@ _08014D80: .4byte gCurrentMoveTurn _08014D84: .4byte gUnknown_030042A4 _08014D88: .4byte gUnknown_030042A0 _08014D8C: .4byte gBattlescriptCurrInstr -_08014D90: .4byte gUnknown_081D9E98 +_08014D90: .4byte gBattlescriptsForSafariActions _08014D94: .4byte gFightStateTracker thumb_func_end sub_8014D50 @@ -5111,7 +5111,7 @@ sub_8014D98: @ 8014D98 movs r0, 0x5 strh r0, [r1] ldr r1, _08014DEC @ =gBattlescriptCurrInstr - ldr r0, _08014DF0 @ =gUnknown_081D9E48 + ldr r0, _08014DF0 @ =gBattlescriptsForBallThrow ldr r0, [r0, 0x14] str r0, [r1] ldr r1, _08014DF4 @ =gFightStateTracker @@ -5127,7 +5127,7 @@ _08014DE0: .4byte gUnknown_030042A0 _08014DE4: .4byte gNumSafariBalls _08014DE8: .4byte gLastUsedItem _08014DEC: .4byte gBattlescriptCurrInstr -_08014DF0: .4byte gUnknown_081D9E48 +_08014DF0: .4byte gBattlescriptsForBallThrow _08014DF4: .4byte gFightStateTracker thumb_func_end sub_8014D98 @@ -5208,7 +5208,7 @@ _08014E9A: strb r0, [r4] _08014E9C: ldr r1, _08014EB0 @ =gBattlescriptCurrInstr - ldr r0, _08014EB4 @ =gUnknown_081D9E98 + ldr r0, _08014EB4 @ =gBattlescriptsForSafariActions ldr r0, [r0, 0x8] str r0, [r1] ldr r1, _08014EB8 @ =gFightStateTracker @@ -5219,7 +5219,7 @@ _08014E9C: bx r0 .align 2, 0 _08014EB0: .4byte gBattlescriptCurrInstr -_08014EB4: .4byte gUnknown_081D9E98 +_08014EB4: .4byte gBattlescriptsForSafariActions _08014EB8: .4byte gFightStateTracker thumb_func_end sub_8014DF8 @@ -5299,7 +5299,7 @@ _08014F54: strb r0, [r1, 0x5] _08014F5A: ldr r1, _08014F74 @ =gBattlescriptCurrInstr - ldr r0, _08014F78 @ =gUnknown_081D9E98 + ldr r0, _08014F78 @ =gBattlescriptsForSafariActions ldr r0, [r0, 0x4] str r0, [r1] ldr r1, _08014F7C @ =gFightStateTracker @@ -5311,7 +5311,7 @@ _08014F5A: .align 2, 0 _08014F70: .4byte gBattleCommunication _08014F74: .4byte gBattlescriptCurrInstr -_08014F78: .4byte gUnknown_081D9E98 +_08014F78: .4byte gBattlescriptsForSafariActions _08014F7C: .4byte gFightStateTracker thumb_func_end sub_8014EBC @@ -5373,7 +5373,7 @@ sub_8014FBC: @ 8014FBC movs r0, 0xFF strb r0, [r1, 0x4] ldr r1, _08015024 @ =gBattlescriptCurrInstr - ldr r0, _08015028 @ =gUnknown_081D9E98 + ldr r0, _08015028 @ =gBattlescriptsForSafariActions ldr r0, [r0, 0xC] str r0, [r1] ldr r1, _0801502C @ =gFightStateTracker @@ -5392,7 +5392,7 @@ _08015018: .4byte gUnknown_030042A0 _0801501C: .4byte gBattleTextBuff1 _08015020: .4byte gBattlePartyID _08015024: .4byte gBattlescriptCurrInstr -_08015028: .4byte gUnknown_081D9E98 +_08015028: .4byte gBattlescriptsForSafariActions _0801502C: .4byte gFightStateTracker _08015030: .4byte gUnknown_02024A76 thumb_func_end sub_8014FBC diff --git a/asm/pc_screen_effect.s b/asm/pc_screen_effect.s index d549d85e1..3c4f96e32 100755 --- a/asm/pc_screen_effect.s +++ b/asm/pc_screen_effect.s @@ -6,185 +6,6 @@ .text - thumb_func_start sub_80C5CD4 -sub_80C5CD4: @ 80C5CD4 - push {r4-r7,lr} - sub sp, 0x28 - adds r7, r0, 0 - ldr r0, _080C5D64 @ =gUnknown_083D1898 - ldr r1, [r0, 0x4] - ldr r0, [r0] - str r0, [sp, 0x18] - str r1, [sp, 0x1C] - ldr r0, _080C5D68 @ =gUnknown_083D18A0 - ldr r1, [r0, 0x4] - ldr r0, [r0] - str r0, [sp, 0x20] - str r1, [sp, 0x24] - mov r1, sp - ldr r0, _080C5D6C @ =gSpriteTemplate_83D18A8 - ldm r0!, {r2-r4} - stm r1!, {r2-r4} - ldm r0!, {r2-r4} - stm r1!, {r2-r4} - ldrh r3, [r7] - lsls r2, r3, 16 - add r0, sp, 0x18 - ldrh r1, [r0, 0x4] - orrs r1, r2 - str r1, [r0, 0x4] - mov r1, sp - movs r6, 0 - strh r3, [r1] - ldrh r2, [r7, 0x2] - ldr r5, _080C5D70 @ =0xffff0000 - add r4, sp, 0x20 - ldr r1, [r4, 0x4] - ands r1, r5 - orrs r1, r2 - str r1, [r4, 0x4] - mov r1, sp - strh r2, [r1, 0x2] - bl LoadSpriteSheet - adds r0, r4, 0 - bl LoadSpritePalette - movs r0, 0x1 - strh r0, [r7, 0xC] - strh r6, [r7, 0xA] - strh r6, [r7, 0x8] - ldrh r0, [r7, 0x2] - bl IndexOfSpritePaletteTag - lsls r0, 24 - lsrs r0, 24 - movs r1, 0x80 - lsls r1, 9 - lsls r1, r0 - bics r5, r1 - str r5, [r7, 0x10] - ldrh r0, [r7, 0x4] - cmp r0, 0 - bne _080C5D4E - movs r0, 0x10 - strh r0, [r7, 0x4] -_080C5D4E: - ldrh r0, [r7, 0x6] - cmp r0, 0 - bne _080C5D58 - movs r0, 0x14 - strh r0, [r7, 0x6] -_080C5D58: - ldr r0, _080C5D74 @ =gUnknown_020387EC - str r7, [r0] - movs r4, 0 - ldr r5, _080C5D78 @ =gSprites - b _080C5D94 - .align 2, 0 -_080C5D64: .4byte gUnknown_083D1898 -_080C5D68: .4byte gUnknown_083D18A0 -_080C5D6C: .4byte gSpriteTemplate_83D18A8 -_080C5D70: .4byte 0xffff0000 -_080C5D74: .4byte gUnknown_020387EC -_080C5D78: .4byte gSprites -_080C5D7C: - lsls r0, r1, 4 - adds r0, r1 - lsls r0, 2 - adds r0, r5 - ldrh r1, [r7, 0x4] - cmp r4, 0x3 - bhi _080C5D8C - negs r1, r1 -_080C5D8C: - strh r1, [r0, 0x2E] - adds r0, r4, 0x1 - lsls r0, 16 - lsrs r4, r0, 16 -_080C5D94: - cmp r4, 0x7 - bhi _080C5DB2 - lsls r1, r4, 5 - adds r1, 0x8 - lsls r1, 16 - asrs r1, 16 - mov r0, sp - movs r2, 0x50 - movs r3, 0 - bl CreateSprite - lsls r0, 24 - lsrs r1, r0, 24 - cmp r1, 0x40 - bne _080C5D7C -_080C5DB2: - ldr r1, _080C5DC8 @ =REG_BLDCNT - movs r0, 0xBF - strh r0, [r1] - adds r1, 0x4 - movs r0, 0x10 - strh r0, [r1] - add sp, 0x28 - pop {r4-r7} - pop {r0} - bx r0 - .align 2, 0 -_080C5DC8: .4byte REG_BLDCNT - thumb_func_end sub_80C5CD4 - - thumb_func_start sub_80C5DCC -sub_80C5DCC: @ 80C5DCC - push {r4,lr} - ldr r4, _080C5E10 @ =gUnknown_020387EC - ldr r1, [r4] - ldrh r0, [r1, 0x8] - cmp r0, 0 - bne _080C5DF0 - ldr r0, [r1, 0x10] - ldr r2, _080C5E14 @ =0x0000ffff - movs r1, 0x10 - bl BlendPalettes - ldr r0, _080C5E18 @ =sub_80C603C - bl sub_80C61B0 - ldr r1, [r4] - ldrh r0, [r1, 0x8] - adds r0, 0x1 - strh r0, [r1, 0x8] -_080C5DF0: - ldr r1, [r4] - ldrh r0, [r1, 0xA] - cmp r0, 0x7 - bls _080C5E0A - ldrh r0, [r1, 0x6] - ldrh r2, [r1, 0xC] - adds r0, r2 - movs r2, 0 - strh r0, [r1, 0xC] - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x4F - bgt _080C5E1C -_080C5E0A: - movs r0, 0 - b _080C5E2E - .align 2, 0 -_080C5E10: .4byte gUnknown_020387EC -_080C5E14: .4byte 0x0000ffff -_080C5E18: .4byte sub_80C603C -_080C5E1C: - movs r0, 0x50 - strh r0, [r1, 0xC] - ldr r0, _080C5E34 @ =REG_BLDCNT - strh r2, [r0] - adds r0, 0x4 - strh r2, [r0] - bl ClearGpuRegBits - movs r0, 0x1 -_080C5E2E: - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_080C5E34: .4byte REG_BLDCNT - thumb_func_end sub_80C5DCC - thumb_func_start sub_80C5E38 sub_80C5E38: @ 80C5E38 push {r4-r7,lr} |