summaryrefslogtreecommitdiff
path: root/include/asm.h
diff options
context:
space:
mode:
authorPikalaxALT <pikalaxalt@gmail.com>2017-06-18 13:01:55 -0400
committerPikalaxALT <pikalaxalt@gmail.com>2017-06-18 13:01:55 -0400
commit5d04fe94d9eed2980ac0b439b0e45af13c792037 (patch)
treebf9f0c1eaecbcf25e9de4ef6d5c99c16f132e5a4 /include/asm.h
parent02af81bc95367d4557189fda0f1dccccf16c852a (diff)
parent13ff901d46f1726d5c0680cf8593484e0e9bbc4d (diff)
Merge remote-tracking branch 'origin/master' into field_map_obj_data
Diffstat (limited to 'include/asm.h')
-rw-r--r--include/asm.h59
1 files changed, 0 insertions, 59 deletions
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