From c7690712d27c1a398bcfcf87fc3bff02717717ee Mon Sep 17 00:00:00 2001 From: gijs Date: Fri, 24 May 2024 11:38:53 +0200 Subject: [PATCH] Remove extern modifier from functions that are decompiled --- include/equipment.h | 73 ++++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 38 deletions(-) diff --git a/include/equipment.h b/include/equipment.h index 1caad7b..9d17ca5 100644 --- a/include/equipment.h +++ b/include/equipment.h @@ -6,8 +6,8 @@ #include "assert.h" #include "element.h" -#include "equipment_type.h" #include "equipment_id.h" +#include "equipment_type.h" typedef struct { /* 0x00 */ char *name; @@ -45,49 +45,46 @@ ASSERT_SIZE(EquipmentData, 0x20); extern EquipmentData obEquipmentData[]; extern s8 (*obEquipmentGetResistance[])(EquipmentId index); -extern char *obEquipmentGetName(EquipmentId index); -extern EquipmentType obEquipmentGetType(EquipmentId index); -extern Element obEquipmentGetElement(EquipmentId index); +char *obEquipmentGetName(EquipmentId index); +EquipmentType obEquipmentGetType(EquipmentId index); +Element obEquipmentGetElement(EquipmentId index); -extern u8 equipment_get_field_0x6(EquipmentId index); -extern u16 obEquipmentGetBuyPrice(EquipmentId index); -extern s8 equipment_get_field_0x10(EquipmentId index); +u8 equipment_get_field_0x6(EquipmentId index); +u16 obEquipmentGetBuyPrice(EquipmentId index); +s8 equipment_get_field_0x10(EquipmentId index); -extern s8 obEquipmentGetStrength(EquipmentId index); -extern s8 obEquipmentGetVitality(EquipmentId index); -extern s8 obEquipmentGetIntelligence(EquipmentId index); -extern s8 obEquipmentGetMentality(EquipmentId index); -extern s8 obEquipmentGetAgility(EquipmentId index); -extern s8 obEquipmentGetDexterity(EquipmentId index); +s8 obEquipmentGetStrength(EquipmentId index); +s8 obEquipmentGetVitality(EquipmentId index); +s8 obEquipmentGetIntelligence(EquipmentId index); +s8 obEquipmentGetMentality(EquipmentId index); +s8 obEquipmentGetAgility(EquipmentId index); +s8 obEquipmentGetDexterity(EquipmentId index); -extern s8 obEquipmentGetResistanceStrike(EquipmentId index); -extern s8 obEquipmentGetResistanceWind(EquipmentId index); -extern s8 obEquipmentGetResistanceFire(EquipmentId index); -extern s8 obEquipmentGetResistanceEarth(EquipmentId index); -extern s8 obEquipmentGetResistanceWater(EquipmentId index); -extern s8 obEquipmentGetResistanceVirtue(EquipmentId index); -extern s8 obEquipmentGetResistanceBane(EquipmentId index); +s8 obEquipmentGetResistanceStrike(EquipmentId index); +s8 obEquipmentGetResistanceWind(EquipmentId index); +s8 obEquipmentGetResistanceFire(EquipmentId index); +s8 obEquipmentGetResistanceEarth(EquipmentId index); +s8 obEquipmentGetResistanceWater(EquipmentId index); +s8 obEquipmentGetResistanceVirtue(EquipmentId index); +s8 obEquipmentGetResistanceBane(EquipmentId index); -extern u8 equipment_get_field_0x18_b68(EquipmentId index); -extern u8 equipment_get_field_0x18_b46(EquipmentId index); -extern u8 equipment_get_field_0x18_b24(EquipmentId index); -extern u8 equipment_get_field_0x18_b12(EquipmentId index); +u8 equipment_get_field_0x18_b68(EquipmentId index); +u8 equipment_get_field_0x18_b46(EquipmentId index); +u8 equipment_get_field_0x18_b24(EquipmentId index); +u8 equipment_get_field_0x18_b12(EquipmentId index); -extern u8 equipment_get_field_0x19_b68(EquipmentId index); -extern u8 equipment_get_field_0x19_b46(EquipmentId index); -extern u8 equipment_get_field_0x19_b24(EquipmentId index); -extern u8 equipment_get_field_0x19_b12(EquipmentId index); +u8 equipment_get_field_0x19_b68(EquipmentId index); +u8 equipment_get_field_0x19_b46(EquipmentId index); +u8 equipment_get_field_0x19_b24(EquipmentId index); +u8 equipment_get_field_0x19_b12(EquipmentId index); -extern u8 equipment_get_field_0x1a_b7(EquipmentId index); +u8 equipment_get_field_0x1a_b7(EquipmentId index); -extern u8 obEquipmentIsWeapon(EquipmentId index); -extern EquipmentId obEquipmentGetFirstWeapon(EquipmentId arg0, - EquipmentId arg1, - EquipmentId arg2, - EquipmentId arg3); -extern EquipmentId obEquipmentGetFirstSpellbook(EquipmentId arg0, - EquipmentId arg1, - EquipmentId arg2, - EquipmentId arg3); +u8 obEquipmentIsWeapon(EquipmentId index); +extern EquipmentId obEquipmentGetFirstWeapon(EquipmentId arg0, EquipmentId arg1, + EquipmentId arg2, + EquipmentId arg3); +EquipmentId obEquipmentGetFirstSpellbook(EquipmentId arg0, EquipmentId arg1, + EquipmentId arg2, EquipmentId arg3); #endif \ No newline at end of file