From 32b056d5041d54539c75a14774a32d82e898501c Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Thu, 24 Nov 2016 11:42:18 -0600 Subject: decompile field_player_avatar.c (#107) * Mark .h files as C instead of C++ * also fix .inc files * start decompiling field_player_avatar.c * more decompilation * fix CheckForFieldObjectCollision * finish decompiling * clean up a bit * Revert .gitattributes --- data/data2.s | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'data') diff --git a/data/data2.s b/data/data2.s index 35121b3de..dfb4773dc 100644 --- a/data/data2.s +++ b/data/data2.s @@ -4732,22 +4732,22 @@ gUnknown_0830FCAC:: @ 830FCAC .align 2 gUnknown_0830FCB4:: @ 830FCB4 - .4byte sub_805A3B4 - .4byte fish1 - .4byte fish2 - .4byte fish3 - .4byte fish4 - .4byte party_menu_update_status_condition_object - .4byte sub_805A5CC - .4byte fish7 - .4byte fish8 - .4byte sub_805A6B4 - .4byte sub_805A6DC - .4byte sub_805A7BC - .4byte sub_805A808 - .4byte fishD - .4byte sub_805A874 - .4byte fishF + .4byte Fishing1 + .4byte Fishing2 + .4byte Fishing3 + .4byte Fishing4 + .4byte Fishing5 + .4byte Fishing6 + .4byte Fishing7 + .4byte Fishing8 + .4byte Fishing9 + .4byte Fishing10 + .4byte Fishing11 + .4byte Fishing12 + .4byte Fishing13 + .4byte Fishing14 + .4byte Fishing15 + .4byte Fishing16 .align 1 gUnknown_0830FCF4:: @ 830FCF4 -- cgit v1.2.3