summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xdata/field_map_obj.s102
-rwxr-xr-xinclude/field_map_obj.h7
-rwxr-xr-xsrc/field_map_obj.c108
3 files changed, 54 insertions, 163 deletions
diff --git a/data/field_map_obj.s b/data/field_map_obj.s
index 00009e7fb..a7c50cd87 100755
--- a/data/field_map_obj.s
+++ b/data/field_map_obj.s
@@ -3,108 +3,6 @@
.section .rodata
- .align 1
-gDirectionToVector:: @ 83756A4
- .2byte 0, 0
- .2byte 0, 1
- .2byte 0, -1
- .2byte -1, 0
- .2byte 1, 0
- .2byte -1, 1
- .2byte 1, 1
- .2byte -1, -1
- .2byte 1, -1
-
-gUnknown_083756C8:: @ 83756C8
- .byte 0x00, 0x00, 0x01, 0x02, 0x03
-
-gUnknown_083756CD:: @ 83756CD
- .byte 0x04, 0x04, 0x05, 0x06, 0x07
-
-gUnknown_083756D2:: @ 83756D2
- .byte 0x08, 0x08, 0x09, 0x0A, 0x0B
-
-gUnknown_083756D7:: @ 83756D7
- .byte 0x15, 0x15, 0x16, 0x17, 0x18
-
-gUnknown_083756DC:: @ 83756DC
- .byte 0x29, 0x29, 0x2A, 0x2B, 0x2C
-
-gUnknown_083756E1:: @ 83756E1
- .byte 0x2D, 0x2D, 0x2E, 0x2F, 0x30
-
-gUnknown_083756E6:: @ 83756E6
- .byte 0x31, 0x31, 0x32, 0x33, 0x34
-
-gUnknown_083756EB:: @ 83756EB
- .byte 0x35, 0x35, 0x36, 0x37, 0x38
-
-gUnknown_083756F0:: @ 83756F0
- .byte 0x0C, 0x0C, 0x0D, 0x0E, 0x0F
-
-gUnknown_083756F5:: @ 83756F5
- .byte 0x46, 0x46, 0x47, 0x48, 0x49
-
-gUnknown_083756FA:: @ 83756FA
- .byte 0x4B, 0x4B, 0x4A, 0x4D, 0x4C
-
-gUnknown_083756FF:: @ 83756FF
- .byte 0x42, 0x42, 0x43, 0x44, 0x45
-
-gUnknown_08375704:: @ 8375704
- .byte 0x3A, 0x3A, 0x3B, 0x3C, 0x3D
-
-gUnknown_08375709:: @ 8375709
- .byte 0x19, 0x19, 0x1A, 0x1B, 0x1C
-
-gUnknown_0837570E:: @ 837570E
- .byte 0x1D, 0x1D, 0x1E, 0x1F, 0x20
-
-gUnknown_08375713:: @ 8375713
- .byte 0x21, 0x21, 0x22, 0x23, 0x24
-
-gUnknown_08375718:: @ 8375718
- .byte 0x25, 0x25, 0x26, 0x27, 0x28
-
-gUnknown_0837571D:: @ 837571D
- .byte 0x62, 0x62, 0x63, 0x64, 0x65
-
-gUnknown_08375722:: @ 8375722
- .byte 0x66, 0x66, 0x67, 0x68, 0x69
-
-gUnknown_08375727:: @ 8375727
- .byte 0x6A, 0x6A, 0x6B, 0x6C, 0x6D
-
-gUnknown_0837572C:: @ 837572C
- .byte 0x6E, 0x6E, 0x6F, 0x70, 0x71
-
-gUnknown_08375731:: @ 8375731
- .byte 0x72, 0x72, 0x73, 0x74, 0x75
-
-gUnknown_08375736:: @ 8375736
- .byte 0x76, 0x76, 0x77, 0x78, 0x79
-
-gUnknown_0837573B:: @ 837573B
- .byte 0x7A, 0x7A, 0x7B, 0x7C, 0x7D
-
-gUnknown_08375740:: @ 8375740
- .byte 0x7E, 0x7E, 0x7F, 0x80, 0x81
-
-gUnknown_08375745:: @ 8375745
- .byte 0x82, 0x82, 0x83, 0x84, 0x85
-
-gUnknown_0837574A:: @ 837574A
- .byte 0x86, 0x86, 0x87, 0x88, 0x89
-
-gUnknown_0837574F:: @ 837574F
- .byte 2, 1, 4, 3, 8, 7, 6, 5
-
-gUnknown_08375757:: @ 8375757
- .byte 2, 1, 4, 3, 1, 2, 3, 4, 3, 4, 2, 1, 4, 3, 1, 2
-
-gUnknown_08375767:: @ 8375767
- .byte 2, 1, 4, 3, 1, 2, 3, 4, 4, 3, 1, 2, 3, 4, 2, 1
-
.align 2
gUnknown_08375778:: @ 8375778
.4byte Unknown_83759A0
diff --git a/include/field_map_obj.h b/include/field_map_obj.h
index 0a45b736b..df115471c 100755
--- a/include/field_map_obj.h
+++ b/include/field_map_obj.h
@@ -66,13 +66,6 @@ u8 oac_hopping(struct MapObject *, struct Sprite *, u8, bool8 (*const)(u8));
u8 sub_805F3EC(struct MapObject *, struct Sprite *, u8, bool8 (*const)(u8));
u8 sub_805F3EC(struct MapObject *, struct Sprite *, u8, bool8 (*const)(u8));
-extern const u8 gUnknown_0837574F[8];
-
-extern const u8 gUnknown_08375757[4][4];
-extern const u8 gUnknown_08375767[4][4];
-
-extern const struct Coords16 gDirectionToVector[];
-
extern struct CameraSomething gUnknown_03004880;
extern u16 gUnknown_03004898;
extern u16 gUnknown_0300489C;
diff --git a/src/field_map_obj.c b/src/field_map_obj.c
index 81d275559..6a394da2d 100755
--- a/src/field_map_obj.c
+++ b/src/field_map_obj.c
@@ -374,7 +374,61 @@ bool8 (*const gUnknown_08375694[])(u8) = {
MetatileBehavior_IsWestBlocked
};
+const struct Coords16 gDirectionToVector[] = {
+ { 0, 0},
+ { 0, 1},
+ { 0, -1},
+ {-1, 0},
+ { 1, 0},
+ {-1, 1},
+ { 1, 1},
+ {-1, -1},
+ { 1, -1}
+};
+
+const u8 gUnknown_083756C8[] = {0x00, 0x00, 0x01, 0x02, 0x03};
+const u8 gUnknown_083756CD[] = {0x04, 0x04, 0x05, 0x06, 0x07};
+const u8 gUnknown_083756D2[] = {0x08, 0x08, 0x09, 0x0A, 0x0B};
+const u8 gUnknown_083756D7[] = {0x15, 0x15, 0x16, 0x17, 0x18};
+const u8 gUnknown_083756DC[] = {0x29, 0x29, 0x2A, 0x2B, 0x2C};
+const u8 gUnknown_083756E1[] = {0x2D, 0x2D, 0x2E, 0x2F, 0x30};
+const u8 gUnknown_083756E6[] = {0x31, 0x31, 0x32, 0x33, 0x34};
+const u8 gUnknown_083756EB[] = {0x35, 0x35, 0x36, 0x37, 0x38};
+const u8 gUnknown_083756F0[] = {0x0C, 0x0C, 0x0D, 0x0E, 0x0F};
+const u8 gUnknown_083756F5[] = {0x46, 0x46, 0x47, 0x48, 0x49};
+const u8 gUnknown_083756FA[] = {0x4B, 0x4B, 0x4A, 0x4D, 0x4C};
+const u8 gUnknown_083756FF[] = {0x42, 0x42, 0x43, 0x44, 0x45};
+const u8 gUnknown_08375704[] = {0x3A, 0x3A, 0x3B, 0x3C, 0x3D};
+const u8 gUnknown_08375709[] = {0x19, 0x19, 0x1A, 0x1B, 0x1C};
+const u8 gUnknown_0837570E[] = {0x1D, 0x1D, 0x1E, 0x1F, 0x20};
+const u8 gUnknown_08375713[] = {0x21, 0x21, 0x22, 0x23, 0x24};
+const u8 gUnknown_08375718[] = {0x25, 0x25, 0x26, 0x27, 0x28};
+const u8 gUnknown_0837571D[] = {0x62, 0x62, 0x63, 0x64, 0x65};
+const u8 gUnknown_08375722[] = {0x66, 0x66, 0x67, 0x68, 0x69};
+const u8 gUnknown_08375727[] = {0x6A, 0x6A, 0x6B, 0x6C, 0x6D};
+const u8 gUnknown_0837572C[] = {0x6E, 0x6E, 0x6F, 0x70, 0x71};
+const u8 gUnknown_08375731[] = {0x72, 0x72, 0x73, 0x74, 0x75};
+const u8 gUnknown_08375736[] = {0x76, 0x76, 0x77, 0x78, 0x79};
+const u8 gUnknown_0837573B[] = {0x7A, 0x7A, 0x7B, 0x7C, 0x7D};
+const u8 gUnknown_08375740[] = {0x7E, 0x7E, 0x7F, 0x80, 0x81};
+const u8 gUnknown_08375745[] = {0x82, 0x82, 0x83, 0x84, 0x85};
+const u8 gUnknown_0837574A[] = {0x86, 0x86, 0x87, 0x88, 0x89};
+
+const u8 gUnknown_0837574F[] = {2, 1, 4, 3, 8, 7, 6, 5};
+
+const u8 gUnknown_08375757[][4] = {
+ {2, 1, 4, 3},
+ {1, 2, 3, 4},
+ {3, 4, 2, 1},
+ {4, 3, 1, 2}
+};
+const u8 gUnknown_08375767[][4] = {
+ {2, 1, 4, 3},
+ {1, 2, 3, 4},
+ {4, 3, 1, 2},
+ {3, 4, 2, 1}
+};
// text
@@ -4210,8 +4264,6 @@ void meta_step(struct MapObject *mapObject, struct Sprite *sprite, u8 (*callback
}
-extern const u8 gUnknown_083756C8[5];
-
u8 GetFaceDirectionAnimId(u8 index)
{
u8 directions[5];
@@ -4223,8 +4275,6 @@ u8 GetFaceDirectionAnimId(u8 index)
return directions[index];
}
-extern const u8 gUnknown_083756CD[5];
-
u8 GetSimpleGoAnimId(u8 index)
{
u8 directions[5];
@@ -4236,8 +4286,6 @@ u8 GetSimpleGoAnimId(u8 index)
return directions[index];
}
-extern const u8 gUnknown_083756D2[5];
-
u8 GetGoSpeed0AnimId(u8 index)
{
u8 directions[5];
@@ -4249,8 +4297,6 @@ u8 GetGoSpeed0AnimId(u8 index)
return directions[index];
}
-extern const u8 gUnknown_083756D7[5];
-
u8 sub_8060744(u8 index)
{
u8 directions[5];
@@ -4262,8 +4308,6 @@ u8 sub_8060744(u8 index)
return directions[index];
}
-extern const u8 gUnknown_083756DC[5];
-
u8 d2s_08064034(u8 index)
{
u8 directions[5];
@@ -4275,8 +4319,6 @@ u8 d2s_08064034(u8 index)
return directions[index];
}
-extern const u8 gUnknown_083756E1[5];
-
u8 sub_806079C(u8 index)
{
u8 directions[5];
@@ -4288,8 +4330,6 @@ u8 sub_806079C(u8 index)
return directions[index];
}
-extern const u8 gUnknown_083756E6[5];
-
u8 sub_80607C8(u8 index)
{
u8 directions[5];
@@ -4301,8 +4341,6 @@ u8 sub_80607C8(u8 index)
return directions[index];
}
-extern const u8 gUnknown_083756EB[5];
-
u8 sub_80607F4(u8 index)
{
u8 directions[5];
@@ -4314,8 +4352,6 @@ u8 sub_80607F4(u8 index)
return directions[index];
}
-extern const u8 gUnknown_083756F0[5];
-
u8 GetJumpLedgeAnimId(u8 index)
{
u8 directions[5];
@@ -4327,8 +4363,6 @@ u8 GetJumpLedgeAnimId(u8 index)
return directions[index];
}
-extern const u8 gUnknown_083756F5[5];
-
u8 sub_806084C(u8 index)
{
u8 directions[5];
@@ -4340,8 +4374,6 @@ u8 sub_806084C(u8 index)
return directions[index];
}
-extern const u8 gUnknown_083756FA[5];
-
u8 sub_8060878(u8 index)
{
u8 directions[5];
@@ -4353,8 +4385,6 @@ u8 sub_8060878(u8 index)
return directions[index];
}
-extern const u8 gUnknown_083756FF[5];
-
u8 sub_80608A4(u8 index)
{
u8 directions[5];
@@ -4366,8 +4396,6 @@ u8 sub_80608A4(u8 index)
return directions[index];
}
-extern const u8 gUnknown_08375704[5];
-
u8 sub_80608D0(u8 index)
{
u8 directions[5];
@@ -4379,8 +4407,6 @@ u8 sub_80608D0(u8 index)
return directions[index];
}
-extern const u8 gUnknown_08375709[5];
-
u8 GetStepInPlaceDelay32AnimId(u8 index)
{
u8 directions[5];
@@ -4392,8 +4418,6 @@ u8 GetStepInPlaceDelay32AnimId(u8 index)
return directions[index];
}
-extern const u8 gUnknown_0837570E[5];
-
u8 GetStepInPlaceDelay16AnimId(u8 index)
{
u8 directions[5];
@@ -4405,8 +4429,6 @@ u8 GetStepInPlaceDelay16AnimId(u8 index)
return directions[index];
}
-extern const u8 gUnknown_08375713[5];
-
u8 GetStepInPlaceDelay8AnimId(u8 index)
{
u8 directions[5];
@@ -4418,8 +4440,6 @@ u8 GetStepInPlaceDelay8AnimId(u8 index)
return directions[index];
}
-extern const u8 gUnknown_08375718[5];
-
u8 GetStepInPlaceDelay4AnimId(u8 index)
{
u8 directions[5];
@@ -4436,8 +4456,6 @@ u8 FieldObjectFaceOppositeDirection(struct MapObject *mapObject, u8 direction)
return FieldObjectSetSpecialAnim(mapObject, GetFaceDirectionAnimId(GetOppositeDirection(direction)));
}
-extern const u8 gUnknown_0837571D[5];
-
u8 sub_80609D8(u8 index)
{
u8 directions[5];
@@ -4449,8 +4467,6 @@ u8 sub_80609D8(u8 index)
return directions[index];
}
-extern const u8 gUnknown_08375722[5];
-
u8 sub_8060A04(u8 index)
{
u8 directions[5];
@@ -4462,8 +4478,6 @@ u8 sub_8060A04(u8 index)
return directions[index];
}
-extern const u8 gUnknown_08375727[5];
-
u8 sub_8060A30(u8 index)
{
u8 directions[5];
@@ -4475,8 +4489,6 @@ u8 sub_8060A30(u8 index)
return directions[index];
}
-extern const u8 gUnknown_0837572C[5];
-
u8 sub_8060A5C(u8 index)
{
u8 directions[5];
@@ -4488,8 +4500,6 @@ u8 sub_8060A5C(u8 index)
return directions[index];
}
-extern const u8 gUnknown_08375731[5];
-
u8 sub_8060A88(u8 index)
{
u8 directions[5];
@@ -4501,8 +4511,6 @@ u8 sub_8060A88(u8 index)
return directions[index];
}
-extern const u8 gUnknown_08375736[5];
-
u8 sub_8060AB4(u8 index)
{
u8 directions[5];
@@ -4514,8 +4522,6 @@ u8 sub_8060AB4(u8 index)
return directions[index];
}
-extern const u8 gUnknown_0837573B[5];
-
u8 sub_8060AE0(u8 index)
{
u8 directions[5];
@@ -4527,8 +4533,6 @@ u8 sub_8060AE0(u8 index)
return directions[index];
}
-extern const u8 gUnknown_08375740[5];
-
u8 sub_8060B0C(u8 index)
{
u8 directions[5];
@@ -4540,8 +4544,6 @@ u8 sub_8060B0C(u8 index)
return directions[index];
}
-extern const u8 gUnknown_08375745[5];
-
u8 sub_8060B38(u8 index)
{
u8 directions[5];
@@ -4553,8 +4555,6 @@ u8 sub_8060B38(u8 index)
return directions[index];
}
-extern const u8 gUnknown_0837574A[5];
-
u8 sub_8060B64(u8 index)
{
u8 directions[5];
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-08 08:53:59 +0000