diff options
Diffstat (limited to 'asm/fldeff_strength.s')
| -rw-r--r-- | asm/fldeff_strength.s | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/asm/fldeff_strength.s b/asm/fldeff_strength.s index fdadd2aac..a0a3f932d 100644 --- a/asm/fldeff_strength.s +++ b/asm/fldeff_strength.s @@ -5,51 +5,51 @@ .text - thumb_func_start hm_prepare_rocksmash -hm_prepare_rocksmash: @ 8145DC4 - push {r4,lr} - movs r0, 0x57 - bl npc_before_player_of_type - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08145DD8 - movs r0, 0 - b _08145DF2 -_08145DD8: - ldr r4, =gSpecialVar_Result - bl GetCursorSelectionMonId - lsls r0, 24 - lsrs r0, 24 - strh r0, [r4] - ldr r1, =gUnknown_03005DB0 - ldr r0, =FieldCallback_Teleport - str r0, [r1] - ldr r1, =gUnknown_0203CEEC - ldr r0, =sub_8145E0C - str r0, [r1] - movs r0, 0x1 -_08145DF2: - pop {r4} - pop {r1} - bx r1 - .pool - thumb_func_end hm_prepare_rocksmash +// thumb_func_start hm_prepare_rocksmash +//hm_prepare_rocksmash: @ 8145DC4 +// push {r4,lr} +// movs r0, 0x57 +// bl npc_before_player_of_type +// lsls r0, 24 +// lsrs r0, 24 +// cmp r0, 0x1 +// beq _08145DD8 +// movs r0, 0 +// b _08145DF2 +//_08145DD8: +// ldr r4, =gSpecialVar_Result +// bl GetCursorSelectionMonId +// lsls r0, 24 +// lsrs r0, 24 +// strh r0, [r4] +// ldr r1, =gUnknown_03005DB0 +// ldr r0, =FieldCallback_Teleport +// str r0, [r1] +// ldr r1, =gUnknown_0203CEEC +// ldr r0, =sub_8145E0C +// str r0, [r1] +// movs r0, 0x1 +//_08145DF2: +// pop {r4} +// pop {r1} +// bx r1 +// .pool +// thumb_func_end hm_prepare_rocksmash - thumb_func_start sub_8145E0C -sub_8145E0C: @ 8145E0C - push {lr} - bl GetCursorSelectionMonId - ldr r1, =gFieldEffectArguments - lsls r0, 24 - lsrs r0, 24 - str r0, [r1] - ldr r0, =FieryPath_EventScript_2908FD - bl ScriptContext1_SetupScript - pop {r0} - bx r0 - .pool - thumb_func_end sub_8145E0C +// thumb_func_start sub_8145E0C +//sub_8145E0C: @ 8145E0C +// push {lr} +// bl GetCursorSelectionMonId +// ldr r1, =gFieldEffectArguments +// lsls r0, 24 +// lsrs r0, 24 +// str r0, [r1] +// ldr r0, =FieryPath_EventScript_2908FD +// bl ScriptContext1_SetupScript +// pop {r0} +// bx r0 +// .pool +// thumb_func_end sub_8145E0C thumb_func_start sub_8145E2C sub_8145E2C: @ 8145E2C |