summaryrefslogtreecommitdiff
path: root/src/rom_8077ABC.c
diff options
context:
space:
mode:
authorcamthesaxman <cameronghall@cox.net>2017-12-22 14:51:12 -0600
committercamthesaxman <cameronghall@cox.net>2017-12-22 14:51:12 -0600
commit9c9bcee1e2fbd3fd374023146f99d0417cd8ab52 (patch)
tree848c1688fe743dd0410183b182024ee961f07980 /src/rom_8077ABC.c
parentce74d72c31a3ebda26adc6ae888700213f64b113 (diff)
parent62bdd4d480ced306b85791c828ee8497e9fa2acc (diff)
fix merge conflicts
Diffstat (limited to 'src/rom_8077ABC.c')
-rw-r--r--src/rom_8077ABC.c17
1 files changed, 2 insertions, 15 deletions
diff --git a/src/rom_8077ABC.c b/src/rom_8077ABC.c
index 165e5e308..347f113c3 100644
--- a/src/rom_8077ABC.c
+++ b/src/rom_8077ABC.c
@@ -51,13 +51,6 @@ struct Struct_gUnknown_0837F578 {
u8 field_1;
};
-struct OamMatrix {
- s16 a;
- s16 b;
- s16 c;
- s16 d;
-};
-
struct Struct_2017810 {
u8 filler_0[6];
u8 field_6;
@@ -70,12 +63,6 @@ struct Color {
u16 b:5;
};
-struct Struct_sub_8078914 {
- u8 *field_0;
- u8 *field_4;
- u8 field_8;
-};
-
struct BGCnt {
u16 priority:2;
u16 charBase:2;
@@ -1435,7 +1422,7 @@ void sub_80798AC(u8 task) {
sub_80797EC(&gTasks[task]);
}
-void sub_80798F4(struct Task *task, u8 a2, void *a3) {
+void sub_80798F4(struct Task *task, u8 a2, const void *a3) {
task->data[7] = 0;
task->data[8] = 0;
task->data[9] = 0;
@@ -1564,7 +1551,7 @@ u16 sub_8079B10(u8 sprite) {
return 0x40;
}
-void sub_8079BF4(s16 *bottom, s16 *top, void *ptr) {
+void sub_8079BF4(s16 *bottom, s16 *top, const void *ptr) {
*bottom = ((intptr_t) ptr) & 0xffff;
*top = (((intptr_t) ptr) >> 16) & 0xffff;
}