From e2daa418623cecbacbd9c9fc6f810e24ee16790f Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Sun, 8 Jan 2017 18:42:17 -0500 Subject: start decompiling field_control_avatar.c (#177) * start decompiling field_control_avatar.c * remove field_control_player_avatar.c --- include/asm.h | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) (limited to 'include/asm.h') 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 -- cgit v1.2.3 From beb36d26968604fbb9b8da433a4a78ada9092e11 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Tue, 10 Jan 2017 22:28:02 -0800 Subject: decompile sub_8067EEC --- include/asm.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'include/asm.h') diff --git a/include/asm.h b/include/asm.h index acf688d84..9e47794f5 100644 --- a/include/asm.h +++ b/include/asm.h @@ -16,7 +16,14 @@ struct UnkInputStruct 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_1_0:1; + u8 input_field_1_1:1; + u8 input_field_1_2:1; + u8 input_field_1_3:1; + u8 input_field_1_4:1; + u8 input_field_1_5:1; + u8 input_field_1_6:1; + u8 input_field_1_7:1; u8 input_field_2; u8 input_field_3; }; -- cgit v1.2.3 From ef82a98a1525f58d3a6c56194a42f7660cfc923b Mon Sep 17 00:00:00 2001 From: Cameron Hall Date: Sat, 21 Jan 2017 22:04:49 -0600 Subject: label a few things and put data in field_player_avatar.c (#212) --- include/asm.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'include/asm.h') diff --git a/include/asm.h b/include/asm.h index 9e47794f5..dd1955bb2 100644 --- a/include/asm.h +++ b/include/asm.h @@ -6,16 +6,16 @@ #include "sprite.h" #include "asm_fieldmap.h" -struct UnkInputStruct +struct FieldInput { - u8 input_field_0_0:1; + u8 pressedAButton:1; u8 input_field_0_1:1; - u8 input_field_0_2:1; - u8 input_field_0_3:1; + u8 pressedStartButton:1; + u8 pressedSelectButton: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 pressedBButton:1; u8 input_field_1_0:1; u8 input_field_1_1:1; u8 input_field_1_2:1; @@ -24,7 +24,7 @@ struct UnkInputStruct u8 input_field_1_5:1; u8 input_field_1_6:1; u8 input_field_1_7:1; - u8 input_field_2; + u8 dpadDirection; u8 input_field_3; }; -- cgit v1.2.3 From ed8f49d5e1418309cbc4f705a242d073258c8639 Mon Sep 17 00:00:00 2001 From: YamaArashi Date: Sat, 28 Jan 2017 13:51:14 -0800 Subject: tabs to spaces --- include/asm.h | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'include/asm.h') diff --git a/include/asm.h b/include/asm.h index dd1955bb2..0b0fc3006 100644 --- a/include/asm.h +++ b/include/asm.h @@ -30,19 +30,19 @@ struct FieldInput struct UnknownStruct_FPA { - u8 unk0; - u8 unk1; - u8 unk2; - s16 unk4; - s16 unk6; - u8 unk8; - u8 unk9; - u8 unkA_0:4; - u8 unkA_4:4; - u16 unkC; - u16 unkE; - u32 unk10; - u16 unk14; + u8 unk0; + u8 unk1; + u8 unk2; + s16 unk4; + s16 unk6; + u8 unk8; + u8 unk9; + u8 unkA_0:4; + u8 unkA_4:4; + u16 unkC; + u16 unkE; + u32 unk10; + u16 unk14; }; #include "asm.inc.h" -- cgit v1.2.3 From ddc846fa6a0d9a13cfba6f52488a66f6f4562a2d Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Thu, 27 Apr 2017 15:43:31 +0200 Subject: Sort includes --- include/asm.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include/asm.h') diff --git a/include/asm.h b/include/asm.h index 0b0fc3006..fe1b3139f 100644 --- a/include/asm.h +++ b/include/asm.h @@ -1,10 +1,10 @@ #ifndef PROJECT_ASM_H #define PROJECT_ASM_H -#include "task.h" +#include "asm_fieldmap.h" #include "main.h" #include "sprite.h" -#include "asm_fieldmap.h" +#include "task.h" struct FieldInput { -- cgit v1.2.3 From f6e3598f5efbda472c6605c94b5597d1196ea619 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Mon, 8 May 2017 22:37:45 +0200 Subject: Decompile ShowPokedexCryScreen --- include/asm.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'include/asm.h') diff --git a/include/asm.h b/include/asm.h index fe1b3139f..e72683e45 100644 --- a/include/asm.h +++ b/include/asm.h @@ -45,6 +45,15 @@ struct UnknownStruct_FPA u16 unk14; }; +struct CryRelatedStruct +{ + u16 unk0; + u8 unk2; + u8 paletteNo; + u8 xPos; + u8 yPos; +}; + #include "asm.inc.h" #endif //PROJECT_ASM_H -- cgit v1.2.3 From 4d2b22a899c11dfcacfec6889968ab01655a3fe3 Mon Sep 17 00:00:00 2001 From: Marijn van der Werf Date: Fri, 26 May 2017 14:53:51 +0200 Subject: Add headers --- include/asm.h | 59 ----------------------------------------------------------- 1 file changed, 59 deletions(-) delete mode 100644 include/asm.h (limited to 'include/asm.h') diff --git a/include/asm.h b/include/asm.h deleted file mode 100644 index e72683e45..000000000 --- a/include/asm.h +++ /dev/null @@ -1,59 +0,0 @@ -#ifndef PROJECT_ASM_H -#define PROJECT_ASM_H - -#include "asm_fieldmap.h" -#include "main.h" -#include "sprite.h" -#include "task.h" - -struct FieldInput -{ - u8 pressedAButton:1; - u8 input_field_0_1:1; - u8 pressedStartButton:1; - u8 pressedSelectButton:1; - u8 input_field_0_4:1; - u8 input_field_0_5:1; - u8 input_field_0_6:1; - u8 pressedBButton:1; - u8 input_field_1_0:1; - u8 input_field_1_1:1; - u8 input_field_1_2:1; - u8 input_field_1_3:1; - u8 input_field_1_4:1; - u8 input_field_1_5:1; - u8 input_field_1_6:1; - u8 input_field_1_7:1; - u8 dpadDirection; - u8 input_field_3; -}; - -struct UnknownStruct_FPA -{ - u8 unk0; - u8 unk1; - u8 unk2; - s16 unk4; - s16 unk6; - u8 unk8; - u8 unk9; - u8 unkA_0:4; - u8 unkA_4:4; - u16 unkC; - u16 unkE; - u32 unk10; - u16 unk14; -}; - -struct CryRelatedStruct -{ - u16 unk0; - u8 unk2; - u8 paletteNo; - u8 xPos; - u8 yPos; -}; - -#include "asm.inc.h" - -#endif //PROJECT_ASM_H -- cgit v1.2.3