diff options
author | Cameron Hall <camthesaxman@users.noreply.github.com> | 2017-01-08 18:42:17 -0500 |
---|---|---|
committer | YamaArashi <YamaArashi@users.noreply.github.com> | 2017-01-08 15:42:17 -0800 |
commit | e2daa418623cecbacbd9c9fc6f810e24ee16790f (patch) | |
tree | 007ac28f815fe5dc6e75a599e977e9e509441fb2 | |
parent | 13598f390ea7c1c882247979fc44878f330877b0 (diff) |
start decompiling field_control_avatar.c (#177)
* start decompiling field_control_avatar.c
* remove field_control_player_avatar.c
-rw-r--r-- | asm/field_control_avatar.s | 493 | ||||
-rw-r--r-- | include/asm.h | 15 | ||||
-rw-r--r-- | include/field_player_avatar.h | 2 | ||||
-rw-r--r-- | ld_script.txt | 1 | ||||
-rw-r--r-- | src/field_control_avatar.c | 229 |
5 files changed, 242 insertions, 498 deletions
diff --git a/asm/field_control_avatar.s b/asm/field_control_avatar.s index e2fd1b54f..c122f7651 100644 --- a/asm/field_control_avatar.s +++ b/asm/field_control_avatar.s @@ -5,499 +5,6 @@ .text - thumb_func_start sub_8067EEC -sub_8067EEC: @ 8067EEC - push {r4,r5,lr} - movs r1, 0x2 - negs r1, r1 - movs r3, 0x3 - negs r3, r3 - movs r4, 0x5 - negs r4, r4 - movs r5, 0x9 - negs r5, r5 - movs r2, 0 - strb r2, [r0] - ldrb r2, [r0, 0x1] - ands r1, r2 - ands r1, r3 - ands r1, r4 - ands r1, r5 - strb r1, [r0, 0x1] - movs r1, 0 - strb r1, [r0, 0x2] - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end sub_8067EEC - - thumb_func_start process_overworld_input -process_overworld_input: @ 8067F18 - push {r4-r7,lr} - mov r7, r9 - mov r6, r8 - push {r6,r7} - adds r4, r0, 0 - lsls r1, 16 - lsrs r5, r1, 16 - lsls r2, 16 - lsrs r2, 16 - mov r8, r2 - ldr r0, _08067FE8 @ =gPlayerAvatar - ldrb r6, [r0, 0x3] - ldrb r0, [r0, 0x2] - mov r9, r0 - bl cur_mapdata_block_role_at_player_pos - lsls r0, 24 - lsrs r0, 24 - bl MetatileBehavior_IsMoveTile - lsls r0, 24 - lsrs r7, r0, 24 - cmp r6, 0x2 - bne _08067F4C - cmp r7, 0 - beq _08067F50 -_08067F4C: - cmp r6, 0 - bne _08067FB2 -_08067F50: - bl sub_80E6034 - lsls r0, 16 - asrs r0, 16 - cmp r0, 0x4 - beq _08067F9C - movs r0, 0x8 - ands r0, r5 - cmp r0, 0 - beq _08067F6C - ldrb r0, [r4] - movs r1, 0x4 - orrs r0, r1 - strb r0, [r4] -_08067F6C: - movs r0, 0x4 - ands r0, r5 - cmp r0, 0 - beq _08067F7C - ldrb r0, [r4] - movs r1, 0x8 - orrs r0, r1 - strb r0, [r4] -_08067F7C: - movs r0, 0x1 - ands r0, r5 - cmp r0, 0 - beq _08067F8C - ldrb r0, [r4] - movs r1, 0x1 - orrs r0, r1 - strb r0, [r4] -_08067F8C: - movs r0, 0x2 - ands r0, r5 - cmp r0, 0 - beq _08067F9C - ldrb r0, [r4] - movs r1, 0x80 - orrs r0, r1 - strb r0, [r4] -_08067F9C: - movs r0, 0xF0 - mov r1, r8 - ands r0, r1 - cmp r0, 0 - beq _08067FB2 - ldrb r0, [r4] - movs r1, 0x10 - orrs r0, r1 - movs r1, 0x20 - orrs r0, r1 - strb r0, [r4] -_08067FB2: - cmp r7, 0 - bne _08067FD8 - cmp r6, 0x2 - bne _08067FC8 - mov r0, r9 - cmp r0, 0x2 - bne _08067FC8 - ldrb r0, [r4] - movs r1, 0x40 - orrs r0, r1 - strb r0, [r4] -_08067FC8: - cmp r7, 0 - bne _08067FD8 - cmp r6, 0x2 - bne _08067FD8 - ldrb r0, [r4] - movs r1, 0x2 - orrs r0, r1 - strb r0, [r4] -_08067FD8: - movs r0, 0x40 - mov r1, r8 - ands r0, r1 - cmp r0, 0 - beq _08067FEC - movs r0, 0x2 - b _08068014 - .align 2, 0 -_08067FE8: .4byte gPlayerAvatar -_08067FEC: - movs r0, 0x80 - mov r1, r8 - ands r0, r1 - cmp r0, 0 - beq _08067FFA - movs r0, 0x1 - b _08068014 -_08067FFA: - movs r0, 0x20 - mov r1, r8 - ands r0, r1 - cmp r0, 0 - beq _08068008 - movs r0, 0x3 - b _08068014 -_08068008: - movs r0, 0x10 - mov r1, r8 - ands r0, r1 - cmp r0, 0 - beq _08068016 - movs r0, 0x4 -_08068014: - strb r0, [r4, 0x2] -_08068016: - pop {r3,r4} - mov r8, r3 - mov r9, r4 - pop {r4-r7} - pop {r0} - bx r0 - thumb_func_end process_overworld_input - - thumb_func_start sub_8068024 -sub_8068024: @ 8068024 - push {r4-r6,lr} - sub sp, 0x8 - adds r5, r0, 0 - bl player_get_direction_lower_nybble - lsls r0, 24 - lsrs r6, r0, 24 - mov r4, sp - mov r0, sp - bl player_get_pos_to_and_height - mov r0, sp - movs r1, 0 - ldrsh r0, [r0, r1] - movs r2, 0x2 - ldrsh r1, [r4, r2] - bl MapGridGetMetatileBehaviorAt - lsls r0, 16 - lsrs r4, r0, 16 - bl CheckTrainers - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08068150 - bl mapheader_run_first_tag2_script_list_match - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08068150 - ldrb r1, [r5] - movs r0, 0x80 - ands r0, r1 - cmp r0, 0 - beq _08068076 - bl sub_80687A4 - cmp r0, 0x1 - beq _08068150 -_08068076: - ldrb r1, [r5] - movs r0, 0x40 - ands r0, r1 - cmp r0, 0 - beq _08068098 - movs r0, 0x5 - bl IncrementGameStat - mov r0, sp - adds r1, r4, 0 - adds r2, r6, 0 - bl sub_80687E4 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08068150 -_08068098: - ldrb r1, [r5] - movs r0, 0x2 - ands r0, r1 - cmp r0, 0 - beq _080680B0 - adds r0, r4, 0 - bl is_it_battle_time_3 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08068150 -_080680B0: - ldrb r1, [r5] - movs r0, 0x10 - ands r0, r1 - cmp r0, 0 - beq _080680D2 - ldrb r0, [r5, 0x2] - cmp r0, r6 - bne _080680D2 - mov r0, sp - adds r1, r4, 0 - adds r2, r6, 0 - bl mapheader_run_first_tag2_script_list_match_conditionally - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08068150 -_080680D2: - mov r4, sp - mov r0, sp - bl player_get_next_pos_and_height - mov r0, sp - movs r1, 0 - ldrsh r0, [r0, r1] - movs r2, 0x2 - ldrsh r1, [r4, r2] - bl MapGridGetMetatileBehaviorAt - lsls r0, 16 - lsrs r4, r0, 16 - ldrb r1, [r5] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _08068108 - mov r0, sp - adds r1, r4, 0 - adds r2, r6, 0 - bl sub_80681F0 - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08068150 -_08068108: - ldrb r1, [r5] - movs r0, 0x20 - ands r0, r1 - cmp r0, 0 - beq _0806812A - ldrb r0, [r5, 0x2] - cmp r0, r6 - bne _0806812A - mov r0, sp - adds r1, r4, 0 - adds r2, r6, 0 - bl map_warp_consider_2_to_inside - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0x1 - beq _08068150 -_0806812A: - ldrb r1, [r5] - movs r0, 0x1 - ands r0, r1 - cmp r0, 0 - beq _0806813C - bl sub_8068770 - cmp r0, 0x1 - beq _08068150 -_0806813C: - ldrb r1, [r5] - movs r0, 0x4 - ands r0, r1 - cmp r0, 0 - beq _08068154 - movs r0, 0x6 - bl PlaySE - bl sub_8071310 -_08068150: - movs r0, 0x1 - b _08068166 -_08068154: - movs r0, 0x8 - ands r0, r1 - cmp r0, 0 - beq _08068164 - bl sub_80A6D1C - cmp r0, 0x1 - beq _08068150 -_08068164: - movs r0, 0 -_08068166: - add sp, 0x8 - pop {r4-r6} - pop {r1} - bx r1 - thumb_func_end sub_8068024 - - thumb_func_start player_get_pos_to_and_height -player_get_pos_to_and_height: @ 8068170 - push {r4,lr} - adds r4, r0, 0 - adds r1, r4, 0x2 - bl PlayerGetDestCoords - bl PlayerGetZCoord - strb r0, [r4, 0x4] - pop {r4} - pop {r0} - bx r0 - thumb_func_end player_get_pos_to_and_height - - thumb_func_start player_get_next_pos_and_height -player_get_next_pos_and_height: @ 8068188 - push {r4,r5,lr} - sub sp, 0x4 - adds r5, r0, 0 - adds r1, r5, 0x2 - bl GetXYCoordsOneStepInFrontOfPlayer - mov r4, sp - adds r4, 0x2 - mov r0, sp - adds r1, r4, 0 - bl PlayerGetDestCoords - mov r0, sp - movs r1, 0 - ldrsh r0, [r0, r1] - movs r2, 0 - ldrsh r1, [r4, r2] - bl MapGridGetZCoordAt - lsls r0, 24 - lsrs r0, 24 - cmp r0, 0 - beq _080681BA - bl PlayerGetZCoord -_080681BA: - strb r0, [r5, 0x4] - add sp, 0x4 - pop {r4,r5} - pop {r0} - bx r0 - thumb_func_end player_get_next_pos_and_height - - thumb_func_start cur_mapdata_block_role_at_player_pos -cur_mapdata_block_role_at_player_pos: @ 80681C4 - push {r4,lr} - sub sp, 0x4 - mov r4, sp - adds r4, 0x2 - mov r0, sp - adds r1, r4, 0 - bl PlayerGetDestCoords - mov r0, sp - movs r1, 0 - ldrsh r0, [r0, r1] - movs r2, 0 - ldrsh r1, [r4, r2] - bl MapGridGetMetatileBehaviorAt - lsls r0, 16 - lsrs r0, 16 - add sp, 0x4 - pop {r4} - pop {r1} - bx r1 - thumb_func_end cur_mapdata_block_role_at_player_pos - - thumb_func_start sub_80681F0 -sub_80681F0: @ 80681F0 - push {r4,lr} - lsls r2, 24 - lsrs r2, 24 - lsls r1, 24 - lsrs r1, 24 - bl TryGetScriptOnPressingA - adds r4, r0, 0 - cmp r4, 0 - bne _08068208 - movs r0, 0 - b _08068234 -_08068208: - ldr r0, _0806823C @ =gUnknown_0815281E - cmp r4, r0 - beq _0806822C - ldr r0, _08068240 @ =gUnknown_08152C39 - cmp r4, r0 - beq _0806822C - ldr r0, _08068244 @ =gUnknown_0815F36C - cmp r4, r0 - beq _0806822C - ldr r0, _08068248 @ =gUnknown_0815F43A - cmp r4, r0 - beq _0806822C - ldr r0, _0806824C @ =gUnknown_081A0009 - cmp r4, r0 - beq _0806822C - movs r0, 0x5 - bl PlaySE -_0806822C: - adds r0, r4, 0 - bl ScriptContext1_SetupScript - movs r0, 0x1 -_08068234: - pop {r4} - pop {r1} - bx r1 - .align 2, 0 -_0806823C: .4byte gUnknown_0815281E -_08068240: .4byte gUnknown_08152C39 -_08068244: .4byte gUnknown_0815F36C -_08068248: .4byte gUnknown_0815F43A -_0806824C: .4byte gUnknown_081A0009 - thumb_func_end sub_80681F0 - - thumb_func_start TryGetScriptOnPressingA -TryGetScriptOnPressingA: @ 8068250 - push {r4-r7,lr} - mov r7, r8 - push {r7} - adds r6, r0, 0 - lsls r1, 24 - lsrs r5, r1, 24 - mov r8, r5 - lsls r2, 24 - lsrs r4, r2, 24 - adds r7, r4, 0 - adds r1, r5, 0 - adds r2, r4, 0 - bl sub_8068364 - cmp r0, 0 - bne _0806829C - adds r0, r6, 0 - adds r1, r5, 0 - adds r2, r4, 0 - bl TryGetInvisibleMapObjectScript - cmp r0, 0 - bne _0806829C - adds r0, r6, 0 - adds r1, r5, 0 - adds r2, r4, 0 - bl sub_8068500 - cmp r0, 0 - bne _0806829C - adds r0, r6, 0 - mov r1, r8 - adds r2, r7, 0 - bl TryGetFieldMoveScript - cmp r0, 0 - bne _0806829C - movs r0, 0 -_0806829C: - pop {r3} - mov r8, r3 - pop {r4-r7} - pop {r1} - bx r1 - thumb_func_end TryGetScriptOnPressingA - thumb_func_start sub_80682A8 sub_80682A8: @ 80682A8 push {r4-r6,lr} diff --git a/include/asm.h b/include/asm.h index ec0516497..acf688d84 100644 --- a/include/asm.h +++ b/include/asm.h @@ -8,10 +8,17 @@ struct UnkInputStruct { - u8 input_field_0; - u8 input_field_1; - u8 input_field_2; - u8 input_field_3; + u8 input_field_0_0:1; + u8 input_field_0_1:1; + u8 input_field_0_2:1; + u8 input_field_0_3:1; + u8 input_field_0_4:1; + u8 input_field_0_5:1; + u8 input_field_0_6:1; + u8 input_field_0_7:1; + u8 input_field_1; + u8 input_field_2; + u8 input_field_3; }; struct UnknownStruct_FPA diff --git a/include/field_player_avatar.h b/include/field_player_avatar.h index 0095c229f..9f6f634f7 100644 --- a/include/field_player_avatar.h +++ b/include/field_player_avatar.h @@ -60,7 +60,7 @@ void GetXYCoordsOneStepInFrontOfPlayer(s16 *x, s16 *y); void PlayerGetDestCoords(s16 *, s16 *); u8 player_get_direction_lower_nybble(void); u8 player_get_direction_upper_nybble(void); -// PlayerGetZCoord +u8 PlayerGetZCoord(void); u8 TestPlayerAvatarFlags(u8); // sub_80597D0 // GetPlayerAvatarObjectId diff --git a/ld_script.txt b/ld_script.txt index b258669dc..ec17f60e2 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -87,6 +87,7 @@ SECTIONS { src/text_window.o(.text); src/script.o(.text); src/scrcmd.o(.text); + src/field_control_avatar.o(.text); asm/field_control_avatar.o(.text); src/event_data.o(.text); src/coord_event_weather.o(.text); diff --git a/src/field_control_avatar.c b/src/field_control_avatar.c new file mode 100644 index 000000000..495327b9b --- /dev/null +++ b/src/field_control_avatar.c @@ -0,0 +1,229 @@ +#include "global.h" +#include "asm.h" +#include "field_player_avatar.h" +#include "metatile_behavior.h" +#include "rom4.h" +#include "script.h" +#include "sound.h" +#include "trainer_see.h" + +extern u8 gUnknown_0815281E[]; +extern u8 gUnknown_08152C39[]; +extern u8 gUnknown_0815F36C[]; +extern u8 gUnknown_0815F43A[]; +extern u8 gUnknown_081A0009[]; + +__attribute__((naked)) +void sub_8067EEC(struct UnkInputStruct *s) +{ + asm(".syntax unified\n\ + push {r4,r5,lr}\n\ + movs r1, 0x2\n\ + negs r1, r1\n\ + movs r3, 0x3\n\ + negs r3, r3\n\ + movs r4, 0x5\n\ + negs r4, r4\n\ + movs r5, 0x9\n\ + negs r5, r5\n\ + movs r2, 0\n\ + strb r2, [r0]\n\ + ldrb r2, [r0, 0x1]\n\ + ands r1, r2\n\ + ands r1, r3\n\ + ands r1, r4\n\ + ands r1, r5\n\ + strb r1, [r0, 0x1]\n\ + movs r1, 0\n\ + strb r1, [r0, 0x2]\n\ + pop {r4,r5}\n\ + pop {r0}\n\ + bx r0\n\ + .syntax divided\n"); +} + +extern u16 cur_mapdata_block_role_at_player_pos(int); + +void process_overworld_input(struct UnkInputStruct *pStruct, u16 keys, u16 heldKeys) +{ + u8 r6 = gPlayerAvatar.running1; + u8 r9 = gPlayerAvatar.running2; + bool8 r7 = MetatileBehavior_IsMoveTile(cur_mapdata_block_role_at_player_pos(r9)); + + if ((r6 == 2 && r7 == FALSE) || r6 == 0) + { + if (sub_80E6034() != 4) + { + if (keys & START_BUTTON) + pStruct->input_field_0_2 = TRUE; + if (keys & SELECT_BUTTON) + pStruct->input_field_0_3 = TRUE; + if (keys & A_BUTTON) + pStruct->input_field_0_0 = TRUE; + if (keys & B_BUTTON) + pStruct->input_field_0_7 = TRUE; + } + if (heldKeys & (DPAD_UP | DPAD_DOWN | DPAD_LEFT | DPAD_RIGHT)) + { + pStruct->input_field_0_4 = TRUE; + pStruct->input_field_0_5 = TRUE; + } + } + if (r7 == FALSE) + { + if (r6 == 2 && r9 == 2) + pStruct->input_field_0_6 = TRUE; + if (r7 == FALSE && r6 == 2) + pStruct->input_field_0_1 = TRUE; + } + if (heldKeys & DPAD_UP) + pStruct->input_field_2 = 2; + else if (heldKeys & DPAD_DOWN) + pStruct->input_field_2 = 1; + else if (heldKeys & DPAD_LEFT) + pStruct->input_field_2 = 3; + else if (heldKeys & DPAD_RIGHT) + pStruct->input_field_2 = 4; +} + +struct MapPosition +{ + s16 x; + s16 y; + u8 height; +}; + +void player_get_pos_to_and_height(struct MapPosition *); +extern u8 mapheader_run_first_tag2_script_list_match(void); +extern int sub_80687A4(void); +extern u8 sub_80687E4(); +extern u8 is_it_battle_time_3(); +extern u8 mapheader_run_first_tag2_script_list_match_conditionally(); +void player_get_next_pos_and_height(struct MapPosition *); +u8 sub_80681F0(struct MapPosition *position, u16 b, u8 c); +extern u8 map_warp_consider_2_to_inside(); +extern int sub_8068770(void); +extern void sub_8071310(void); +extern int sub_80A6D1C(void); + +int sub_8068024(struct UnkInputStruct *s) +{ + struct MapPosition position; + u8 r6; + u16 r4; + + r6 = player_get_direction_lower_nybble(); + player_get_pos_to_and_height(&position); + r4 = MapGridGetMetatileBehaviorAt(position.x, position.y); + if (CheckTrainers() == TRUE) + return 1; + if (mapheader_run_first_tag2_script_list_match() == 1) + return 1; + if (s->input_field_0_7 && sub_80687A4() == 1) + return 1; + if (s->input_field_0_6) + { + IncrementGameStat(5); + if (sub_80687E4(&position, r4, r6) == 1) + return 1; + } + if (s->input_field_0_1 && is_it_battle_time_3(r4) == 1) + return 1; + if (s->input_field_0_4 && s->input_field_2 == r6) + { + if (mapheader_run_first_tag2_script_list_match_conditionally(&position, r4, r6) == 1) + return 1; + } + player_get_next_pos_and_height(&position); + r4 = MapGridGetMetatileBehaviorAt(position.x, position.y); + if (s->input_field_0_0 && sub_80681F0(&position, r4, r6) == 1) + return 1; + if (s->input_field_0_5 && s->input_field_2 == r6) + { + if (map_warp_consider_2_to_inside(&position, r4, r6) == 1) + return 1; + } + if (s->input_field_0_0 && sub_8068770() == 1) + return 1; + if (s->input_field_0_2) + { + PlaySE(6); + sub_8071310(); + return 1; + } + //_08068154 + if (s->input_field_0_3 && sub_80A6D1C() == 1) + return 1; + return FALSE; +} + +void player_get_pos_to_and_height(struct MapPosition *position) +{ + PlayerGetDestCoords(&position->x, &position->y); + position->height = PlayerGetZCoord(); +} + +void player_get_next_pos_and_height(struct MapPosition *position) +{ + s16 x, y; + + GetXYCoordsOneStepInFrontOfPlayer(&position->x, &position->y); + PlayerGetDestCoords(&x, &y); + if (MapGridGetZCoordAt(x, y) != 0) + position->height = PlayerGetZCoord(); + else + position->height = 0; +} + +u16 cur_mapdata_block_role_at_player_pos(int unused) +{ + s16 x, y; + + PlayerGetDestCoords(&x, &y); + return MapGridGetMetatileBehaviorAt(x, y); +} + +u8 *TryGetScriptOnPressingA(struct MapPosition *position, u8 b, u8 c); + +u8 sub_80681F0(struct MapPosition *position, u16 b, u8 c) +{ + u8 *script = TryGetScriptOnPressingA(position, b, c); + + if (script == NULL) + return FALSE; + + if (script != gUnknown_0815281E + && script != gUnknown_08152C39 + && script != gUnknown_0815F36C + && script != gUnknown_0815F43A + && script != gUnknown_081A0009) + PlaySE(5); + + ScriptContext1_SetupScript(script); + return TRUE; +} + +u8 *sub_8068364(); +u8 *TryGetInvisibleMapObjectScript(); +u8 *sub_8068500(); +u8 *TryGetFieldMoveScript(); + +u8 *TryGetScriptOnPressingA(struct MapPosition *position, u8 b, u8 c) +{ + u8 *script; + + script = sub_8068364(position, b, c); + if (script != NULL) + return script; + script = TryGetInvisibleMapObjectScript(position, b, c); + if (script != NULL) + return script; + script = sub_8068500(position, b, c); + if (script != NULL) + return script; + script = TryGetFieldMoveScript(position, b, c); + if (script != NULL) + return script; + + return NULL; +} |