From 3aff112127ddb67882bfce31d046eb886e0aa2c1 Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Tue, 16 Oct 2018 14:55:16 +0100 Subject: Begin synchronising with pokeruby --- asm/field_player_avatar.s | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'asm') diff --git a/asm/field_player_avatar.s b/asm/field_player_avatar.s index c7b3a0486..e404a90a0 100644 --- a/asm/field_player_avatar.s +++ b/asm/field_player_avatar.s @@ -954,7 +954,7 @@ PlayCollisionSoundIfNotFacingWarp: @ 808B9EC lsls r0, 2 adds r0, r2 ldrb r0, [r0, 0x1E] - ldr r2, =gUnknown_084974D8 + ldr r2, =sArrowWarpMetatileBehaviorChecks subs r1, r4, 0x1 lsls r1, 2 adds r1, r2 @@ -1334,7 +1334,7 @@ GetRivalAvatarGraphicsIdByStateIdAndGender: @ 808BD3C lsls r0, 24 lsls r1, 24 lsrs r1, 24 - ldr r2, =gUnknown_084974E8 + ldr r2, =sRivalAvatarGfxIds lsrs r0, 23 adds r1, r0 adds r1, r2 @@ -1349,7 +1349,7 @@ GetPlayerAvatarGraphicsIdByStateIdAndGender: @ 808BD54 lsls r0, 24 lsls r1, 24 lsrs r1, 24 - ldr r2, =gUnknown_084974F8 + ldr r2, =sPlayerAvatarGfxIds lsrs r0, 23 adds r1, r0 adds r1, r2 @@ -2046,7 +2046,7 @@ sub_808C280: @ 808C280 mov r0, sp strh r1, [r0] movs r6, 0x1 - ldr r1, =gUnknown_08497520 + ldr r1, =sArrowWarpMetatileBehaviorChecks2 mov r9, r1 mov r4, sp mov r7, sp @@ -2783,7 +2783,7 @@ Task_Fish: @ 808C8C0 push {r4,r5,lr} lsls r0, 24 lsrs r0, 24 - ldr r5, =gUnknown_0849755C + ldr r5, =sFishingStateFuncs ldr r2, =gTasks lsls r1, r0, 2 adds r1, r0 @@ -2958,7 +2958,7 @@ fish4: @ 808CA20 push {r4,r5,lr} sub sp, 0x10 adds r4, r0, 0 - ldr r1, =gUnknown_084975A8 + ldr r1, =gText_Dot add r0, sp, 0xC movs r2, 0x2 bl memcpy @@ -3151,7 +3151,7 @@ fish7: @ 808CBA4 push {r4,lr} sub sp, 0x8 adds r4, r0, 0 - ldr r1, =gUnknown_084975AA + ldr r1, =sReelTimeouts mov r0, sp movs r2, 0x6 bl memcpy @@ -3851,7 +3851,7 @@ _0808D14A: strh r0, [r7, 0x22] movs r2, 0x22 ldrsh r1, [r7, r2] - ldr r0, =gUnknown_03005DE8 + ldr r0, =gTotalCameraPixelOffsetY movs r2, 0 ldrsh r0, [r0, r2] adds r1, r0 -- cgit v1.2.3 From 1435c96b41049da3a05ed97d9a07b355aacbac4f Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Wed, 17 Oct 2018 01:11:44 +0100 Subject: Further synchronisation --- asm/field_control_avatar.s | 10 +++++----- asm/field_screen.s | 2 +- asm/fldeff_80F9BCC.s | 16 ++++++++-------- 3 files changed, 14 insertions(+), 14 deletions(-) (limited to 'asm') diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index c299d6633..65e8ed8b4 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -178,9 +178,9 @@ _0809C006: bx r0 thumb_func_end FieldGetPlayerInput - thumb_func_start sub_809C014 -@ int sub_809C014(overworld_input_data *input_data) -sub_809C014: @ 809C014 + thumb_func_start ProcessPlayerFieldInput +@ int ProcessPlayerFieldInput(overworld_input_data *input_data) +ProcessPlayerFieldInput: @ 809C014 push {r4-r6,lr} sub sp, 0x8 adds r5, r0, 0 @@ -348,7 +348,7 @@ _0809C172: pop {r4-r6} pop {r1} bx r1 - thumb_func_end sub_809C014 + thumb_func_end ProcessPlayerFieldInput thumb_func_start player_get_pos_to_and_height player_get_pos_to_and_height: @ 809C17C @@ -1560,7 +1560,7 @@ overworld_poison_step: @ 809CB94 strh r1, [r0] cmp r1, 0 bne _0809CBD4 - bl overworld_poison + bl DoPoisonFieldEffect cmp r0, 0x1 beq _0809CBD4 cmp r0, 0x1 diff --git a/asm/field_screen.s b/asm/field_screen.s index c11aef1b4..8a97644ac 100644 --- a/asm/field_screen.s +++ b/asm/field_screen.s @@ -7851,7 +7851,7 @@ palette_bg_faded_fill_black: @ 80AF020 thumb_func_start pal_fill_for_maplights pal_fill_for_maplights: @ 80AF040 push {r4,lr} - bl get_map_light_from_warp0 + bl GetLastUsedWarpMapType adds r4, r0, 0 lsls r4, 24 lsrs r4, 24 diff --git a/asm/fldeff_80F9BCC.s b/asm/fldeff_80F9BCC.s index 3cfbe215a..e31997849 100644 --- a/asm/fldeff_80F9BCC.s +++ b/asm/fldeff_80F9BCC.s @@ -2200,8 +2200,8 @@ _080FAE2A: .pool thumb_func_end sub_80FADE4 - thumb_func_start task50_overworld_poison_effect -task50_overworld_poison_effect: @ 80FAE38 + thumb_func_start task50_FldeffPoison_Start +task50_FldeffPoison_Start: @ 80FAE38 push {lr} lsls r0, 24 lsrs r2, r0, 24 @@ -2260,25 +2260,25 @@ _080FAE92: _080FAEA2: pop {r0} bx r0 - thumb_func_end task50_overworld_poison_effect + thumb_func_end task50_FldeffPoison_Start - thumb_func_start overworld_poison_effect -overworld_poison_effect: @ 80FAEA8 + thumb_func_start FldeffPoison_Start +FldeffPoison_Start: @ 80FAEA8 push {lr} movs r0, 0x4F bl PlaySE - ldr r0, =task50_overworld_poison_effect + ldr r0, =task50_FldeffPoison_Start movs r1, 0x50 bl CreateTask pop {r0} bx r0 .pool - thumb_func_end overworld_poison_effect + thumb_func_end FldeffPoison_Start thumb_func_start FieldPoisonEffectIsRunning FieldPoisonEffectIsRunning: @ 80FAEC0 push {lr} - ldr r0, =task50_overworld_poison_effect + ldr r0, =task50_FldeffPoison_Start bl FuncIsActiveTask lsls r0, 24 lsrs r0, 24 -- cgit v1.2.3 From bd766b90491909b6bdd4c47a1cbd526f22bdc9c3 Mon Sep 17 00:00:00 2001 From: Slawter666 <38655737+Slawter666@users.noreply.github.com> Date: Sat, 3 Nov 2018 20:20:28 +0000 Subject: Minor labelling of field effects --- asm/fldeff_80F9BCC.s | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'asm') diff --git a/asm/fldeff_80F9BCC.s b/asm/fldeff_80F9BCC.s index e31997849..a361faa32 100644 --- a/asm/fldeff_80F9BCC.s +++ b/asm/fldeff_80F9BCC.s @@ -2200,8 +2200,8 @@ _080FAE2A: .pool thumb_func_end sub_80FADE4 - thumb_func_start task50_FldeffPoison_Start -task50_FldeffPoison_Start: @ 80FAE38 + thumb_func_start task50_overworld_poison_effect +task50_overworld_poison_effect: @ 80FAE38 push {lr} lsls r0, 24 lsrs r2, r0, 24 @@ -2260,14 +2260,14 @@ _080FAE92: _080FAEA2: pop {r0} bx r0 - thumb_func_end task50_FldeffPoison_Start + thumb_func_end task50_overworld_poison_effect thumb_func_start FldeffPoison_Start FldeffPoison_Start: @ 80FAEA8 push {lr} movs r0, 0x4F bl PlaySE - ldr r0, =task50_FldeffPoison_Start + ldr r0, =task50_overworld_poison_effect movs r1, 0x50 bl CreateTask pop {r0} @@ -2278,7 +2278,7 @@ FldeffPoison_Start: @ 80FAEA8 thumb_func_start FieldPoisonEffectIsRunning FieldPoisonEffectIsRunning: @ 80FAEC0 push {lr} - ldr r0, =task50_FldeffPoison_Start + ldr r0, =task50_overworld_poison_effect bl FuncIsActiveTask lsls r0, 24 lsrs r0, 24 -- cgit v1.2.3