From 2a833b5923665d740e5bc1b5b541a1e71e5c4341 Mon Sep 17 00:00:00 2001 From: Aetias Date: Tue, 30 Apr 2024 19:19:15 +0200 Subject: [PATCH] `make gen_externs` --- asm/ov00/Item/ItemManager.inc | 7 -- asm/ov02.inc | 4 +- asm/ov05.inc | 8 +-- asm/ov12.inc | 2 +- asm/ov14/ov14_0213b778.inc | 78 ++++++++++----------- asm/ov15.inc | 126 +++++++++++++++++----------------- asm/ov26.inc | 42 ++++++------ asm/ov38.inc | 2 +- 8 files changed, 131 insertions(+), 138 deletions(-) diff --git a/asm/ov00/Item/ItemManager.inc b/asm/ov00/Item/ItemManager.inc index 9f1713db..6f70f09b 100644 --- a/asm/ov00/Item/ItemManager.inc +++ b/asm/ov00/Item/ItemManager.inc @@ -1,8 +1 @@ #pragma once -.extern _ZNK11ItemManager9HasPotionEj -.extern data_027e0f78 -.extern data_ov00_020eec68 -.extern func_020196bc -.extern func_020196fc -.extern PlaySoundEffect -.extern gItemManager diff --git a/asm/ov02.inc b/asm/ov02.inc index c341bb21..afd888d4 100644 --- a/asm/ov02.inc +++ b/asm/ov02.inc @@ -12,8 +12,8 @@ .extern _ZNK11ItemManager13GetFairyLevelEi .extern _ZNK11ItemManager16GetShipPartCountEjj .extern _ZNK11ItemManager18GetUnk_09e_DividedEj -.extern _ZNK11ItemManager21HasShipPartPriceShownEjj .extern _ZNK11ItemManager19GetEquippedShipPartEj +.extern _ZNK11ItemManager21HasShipPartPriceShownEjj .extern _ZNK11ItemManager21HasTreasurePriceShownEj .extern _ZNK11ItemManager7HasItemEi .extern __register_global_object @@ -34,7 +34,6 @@ .extern data_027e0d78 .extern data_027e0f88 .extern data_027e0f8c -.extern gHealthManager .extern data_027e1044 .extern data_027e1050 .extern data_027e1058 @@ -258,5 +257,6 @@ .extern func_ov45_0218a284 .extern func_ov45_0218db94 .extern gAdventureFlags +.extern gHealthManager .extern gItemManager .extern gMapManager diff --git a/asm/ov05.inc b/asm/ov05.inc index 843a02d2..901ca129 100644 --- a/asm/ov05.inc +++ b/asm/ov05.inc @@ -1,5 +1,6 @@ #pragma once .extern Divide +.extern GiveShipPart .extern _ZN10MapManager16MapData_vfunc_68Ev .extern _ZN10MapManager16MapData_vfunc_78Ev .extern _ZN10MapManager16MapData_vfunc_84Ev @@ -148,6 +149,8 @@ .extern _ZN17LinkStateInteract24SetNormalizedThrowOffsetEP5Vec3p .extern _ZN4Item18func_ov00_020ad020Ei .extern _ZN5Actor9GetHitboxEP8Cylinder +.extern _ZN7MapBase18func_ov00_0207dea0Eb +.extern _ZN7MapBase18func_ov00_02080de8Ei .extern _ZN9SysObjectdlEPv .extern _ZNK11ItemManager13HasAllPotionsEv .extern _ZNK11ItemManager15HasPurplePotionEv @@ -201,7 +204,6 @@ .extern data_027e0fac .extern data_027e0fb0 .extern data_027e0fb8 -.extern gHealthManager .extern data_027e0fc0 .extern data_027e0fc8 .extern data_027e0fcc @@ -360,8 +362,6 @@ .extern func_ov00_0207c1f8 .extern func_ov00_0207c358 .extern func_ov00_0207c444 -.extern _ZN7MapBase18func_ov00_0207dea0Eb -.extern _ZN7MapBase18func_ov00_02080de8Ei .extern func_ov00_02081f4c .extern func_ov00_0208726c .extern func_ov00_020872e8 @@ -509,7 +509,6 @@ .extern func_ov09_02118cd4 .extern func_ov09_0211c724 .extern func_ov09_0211c808 -.extern GiveShipPart .extern func_ov09_0211cac0 .extern func_ov12_02134208 .extern func_ov14_02127df4 @@ -575,6 +574,7 @@ .extern func_ov59_0219907c .extern func_ov59_021990a4 .extern gAdventureFlags +.extern gHealthManager .extern gItemManager .extern gMapManager .extern gOverlayManager diff --git a/asm/ov12.inc b/asm/ov12.inc index dc1fa955..0303dc97 100644 --- a/asm/ov12.inc +++ b/asm/ov12.inc @@ -1,6 +1,7 @@ #pragma once .extern Approach_thunk .extern Divide +.extern PlaySoundEffect .extern _ZN10MapManager16MapData_vfunc_68Ev .extern _ZN10MapManager17GetMapData_Unk_48Ev .extern _ZN10MapManager17Get_MapData_Unk28Ev @@ -632,7 +633,6 @@ .extern func_ov00_020d70a4 .extern func_ov00_020d716c .extern func_ov00_020d7180 -.extern PlaySoundEffect .extern func_ov00_020d7404 .extern func_ov00_020d77e4 .extern func_ov00_020d7a84 diff --git a/asm/ov14/ov14_0213b778.inc b/asm/ov14/ov14_0213b778.inc index 7cbae315..eaf3fe77 100644 --- a/asm/ov14/ov14_0213b778.inc +++ b/asm/ov14/ov14_0213b778.inc @@ -1,6 +1,42 @@ #pragma once .extern Approach_thunk .extern Divide +.extern _ZN10MapManager16MapData_vfunc_54Ev +.extern _ZN10MapManager16MapData_vfunc_68Ev +.extern _ZN10MapManager16MapData_vfunc_78Ev +.extern _ZN10MapManager16MapData_vfunc_b4Ev +.extern _ZN10MapManager17GetMapData_Unk_06Ev +.extern _ZN10MapManager17GetMapData_Unk_07Ev +.extern _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p +.extern _ZN10MapManager17Get_MapData_Unk28Ev +.extern _ZN10MapManager17Get_MapData_Unk2aEv +.extern _ZN10MapManager18func_ov00_020823c4EPii +.extern _ZN10MapManager18func_ov00_020823d4Ei +.extern _ZN10MapManager18func_ov00_020823e4Ei +.extern _ZN10MapManager18func_ov00_02082680Eii +.extern _ZN10MapManager18func_ov00_020826a0Eiii +.extern _ZN10MapManager18func_ov00_02082d08Ev +.extern _ZN10MapManager18func_ov00_020836dcEii +.extern _ZN10MapManager18func_ov00_02083770Eji +.extern _ZN10MapManager18func_ov00_02083790Ei +.extern _ZN10MapManager18func_ov00_02083840Ei +.extern _ZN10MapManager18func_ov00_020838e8EjPi +.extern _ZN10MapManager18func_ov00_020839b4Ei +.extern _ZN10MapManager18func_ov00_020839c4Ei +.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p +.extern _ZN10MapManager18func_ov00_02083e34Ecci +.extern _ZN10MapManager18func_ov00_020840dcEv +.extern _ZN10MapManager18func_ov00_020843ecEPi +.extern _ZN10MapManager18func_ov00_020849c0Ev +.extern _ZN10MapManager18func_ov00_020849dcEv +.extern _ZN10MapManager18func_ov00_02084ac4Ej +.extern _ZN10MapManager18func_ov00_02084c7cEi +.extern _ZN10MapManager18func_ov00_02084c94Ei +.extern _ZN10MapManager18func_ov00_02084cb0Ei +.extern _ZN10MapManager18func_ov00_02084cc8Ei +.extern _ZN10MapManager20GetCourseData_Unk_86Ev +.extern _ZN10MapManager20GetCourseData_Unk_87Ev +.extern _ZN10MapManager8SpawnNPCEP5Vec3pii .extern _ZN10PlayerBase18func_ov00_020a7c00Ei .extern _ZN10PlayerBase9AddHealthEs .extern _ZN10PlayerBase9SetHealthEs @@ -91,6 +127,8 @@ .extern _ZN5Actor9GetHitboxEP8Cylinder .extern _ZN5ActorC2Ev .extern _ZN5ActorD2Ev +.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeD1Ev .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj .extern _ZNK11ItemManager10GetMaxAmmoEi @@ -124,7 +162,6 @@ .extern data_027e0d44 .extern data_027e0d78 .extern data_027e0e58 -.extern gMapManager .extern data_027e0f64 .extern data_027e0f68 .extern data_027e0f6c @@ -288,8 +325,6 @@ .extern func_020386c4 .extern func_020386cc .extern func_0203d7e0 -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv -.extern _ZN9ActorTypeD1Ev .extern func_0203eb0c .extern func_0203eba8 .extern func_0203ebc8 @@ -314,42 +349,6 @@ .extern func_ov00_0207c444 .extern func_ov00_0207c474 .extern func_ov00_02081f4c -.extern _ZN10MapManager18func_ov00_020823c4EPii -.extern _ZN10MapManager18func_ov00_020823d4Ei -.extern _ZN10MapManager18func_ov00_020823e4Ei -.extern _ZN10MapManager16MapData_vfunc_b4Ev -.extern _ZN10MapManager18func_ov00_02082680Eii -.extern _ZN10MapManager18func_ov00_020826a0Eiii -.extern _ZN10MapManager18func_ov00_02082d08Ev -.extern _ZN10MapManager20GetCourseData_Unk_86Ev -.extern _ZN10MapManager20GetCourseData_Unk_87Ev -.extern _ZN10MapManager17Get_MapData_Unk28Ev -.extern _ZN10MapManager17Get_MapData_Unk2aEv -.extern _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p -.extern _ZN10MapManager18func_ov00_020836dcEii -.extern _ZN10MapManager18func_ov00_02083770Eji -.extern _ZN10MapManager18func_ov00_02083790Ei -.extern _ZN10MapManager18func_ov00_02083840Ei -.extern _ZN10MapManager18func_ov00_020838e8EjPi -.extern _ZN10MapManager18func_ov00_020839b4Ei -.extern _ZN10MapManager18func_ov00_020839c4Ei -.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p -.extern _ZN10MapManager18func_ov00_02083e34Ecci -.extern _ZN10MapManager16MapData_vfunc_68Ev -.extern _ZN10MapManager16MapData_vfunc_54Ev -.extern _ZN10MapManager16MapData_vfunc_78Ev -.extern _ZN10MapManager18func_ov00_020840dcEv -.extern _ZN10MapManager18func_ov00_020843ecEPi -.extern _ZN10MapManager17GetMapData_Unk_06Ev -.extern _ZN10MapManager17GetMapData_Unk_07Ev -.extern _ZN10MapManager18func_ov00_020849c0Ev -.extern _ZN10MapManager18func_ov00_020849dcEv -.extern _ZN10MapManager8SpawnNPCEP5Vec3pii -.extern _ZN10MapManager18func_ov00_02084ac4Ej -.extern _ZN10MapManager18func_ov00_02084c7cEi -.extern _ZN10MapManager18func_ov00_02084c94Ei -.extern _ZN10MapManager18func_ov00_02084cb0Ei -.extern _ZN10MapManager18func_ov00_02084cc8Ei .extern func_ov00_0208726c .extern func_ov00_020876bc .extern func_ov00_0208819c @@ -852,6 +851,7 @@ .extern gAdventureFlags .extern gHealthManager .extern gItemManager +.extern gMapManager .extern gOverlayManager .extern gPlayerAnimHandler .extern strcat diff --git a/asm/ov15.inc b/asm/ov15.inc index 80e6e728..769579e3 100644 --- a/asm/ov15.inc +++ b/asm/ov15.inc @@ -2,6 +2,42 @@ .extern Approach_thunk .extern Divide .extern GiveShipPart +.extern PlaySoundEffect +.extern _ZN10MapManager16MapData_vfunc_68Ev +.extern _ZN10MapManager17GetMapData_Unk_dcEP5Vec3p +.extern _ZN10MapManager17GetMapData_Unk_e8EP5Vec3p +.extern _ZN10MapManager18func_ov00_020823a4Ei +.extern _ZN10MapManager18func_ov00_020823b4Ev +.extern _ZN10MapManager18func_ov00_02082424Ev +.extern _ZN10MapManager18func_ov00_02082454Eii +.extern _ZN10MapManager18func_ov00_02082494Ei +.extern _ZN10MapManager18func_ov00_020824ccEi +.extern _ZN10MapManager18func_ov00_02082504Ev +.extern _ZN10MapManager18func_ov00_02082594Ev +.extern _ZN10MapManager18func_ov00_020825acEv +.extern _ZN10MapManager18func_ov00_02082650Eiii +.extern _ZN10MapManager18func_ov00_02082660Eii +.extern _ZN10MapManager18func_ov00_02082d08Ev +.extern _ZN10MapManager18func_ov00_02082d40Ev +.extern _ZN10MapManager18func_ov00_02083374Ev +.extern _ZN10MapManager18func_ov00_02083384Ev +.extern _ZN10MapManager18func_ov00_0208346cEP4AABB +.extern _ZN10MapManager18func_ov00_020836bcEjPi +.extern _ZN10MapManager18func_ov00_020836dcEii +.extern _ZN10MapManager18func_ov00_02083770Eji +.extern _ZN10MapManager18func_ov00_020838c8Ei +.extern _ZN10MapManager18func_ov00_020838d8Ei +.extern _ZN10MapManager18func_ov00_020838e8EjPi +.extern _ZN10MapManager18func_ov00_02083c24Ei +.extern _ZN10MapManager18func_ov00_02083c50Ei +.extern _ZN10MapManager18func_ov00_020846a4Ev +.extern _ZN10MapManager18func_ov00_020848b8Ev +.extern _ZN10MapManager18func_ov00_02084b38Eiii +.extern _ZN10MapManager18func_ov00_02084cb0Ei +.extern _ZN10MapManager18func_ov00_02084cc8Ei +.extern _ZN10MapManager18func_ov00_02084d4cEiiP5Vec3p +.extern _ZN10MapManager18func_ov00_02085c60Eiiii +.extern _ZN10MapManager8SpawnNPCEP5Vec3pii .extern _ZN10PlayerBase10GetEquipIdEv .extern _ZN10PlayerBase18TeleportToEntranceEib .extern _ZN10PlayerBase18func_ov00_020a7c00Ei @@ -13,8 +49,8 @@ .extern _ZN11ItemManager10GiveRupeesEsb .extern _ZN11ItemManager10SetUnk_09eEjt .extern _ZN11ItemManager15LoadFanfareItemEi -.extern _ZN11ItemManager18func_ov00_020ad528Ev .extern _ZN11ItemManager18PlayItemFanfareSfxEi +.extern _ZN11ItemManager18func_ov00_020ad528Ev .extern _ZN11ItemManager19SetTreasureSalvagedEj .extern _ZN11ItemManager8GiveItemEi .extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList @@ -107,6 +143,31 @@ .extern _ZN5Actor9GetHitboxEP8Cylinder .extern _ZN5ActorC2Ev .extern _ZN5ActorD2Ev +.extern _ZN6Course14FindMapGridPosEP5Vec2bPS_j +.extern _ZN6Course14GetAdjacentMapEi +.extern _ZN6Course18func_ov00_0207ca78Eici +.extern _ZN6Course18func_ov00_0207ce20EiiPci +.extern _ZN6Course18func_ov00_0207d7bcEv +.extern _ZN6Course23IsAdjacentMapOnMainGridEi +.extern _ZN7MapBase14GetMapFilePathEPcii +.extern _ZN7MapBase18func_ov00_0207ddf8Eb +.extern _ZN7MapBase18func_ov00_0207dea0Eb +.extern _ZN7MapBase18func_ov00_02080140EP4Exit +.extern _ZN7MapBase22GetOverlappingTriggersEP5Vec3pPP11TriggerBasei +.extern _ZN7MapBase8vfunc_48Ev +.extern _ZN7MapBase8vfunc_58Ev +.extern _ZN7MapBase8vfunc_64Ev +.extern _ZN7MapBase8vfunc_94Ev +.extern _ZN7MapBase8vfunc_98Ev +.extern _ZN7MapBase8vfunc_a4Ev +.extern _ZN7MapBase8vfunc_a8Ev +.extern _ZN7MapBase8vfunc_acEv +.extern _ZN7MapBase8vfunc_bcEv +.extern _ZN7MapBase8vfunc_c0Ev +.extern _ZN7MapBase9SetBoundsEii +.extern _ZN7MapBaseD1Ev +.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeD1Ev .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj .extern _ZNK11ItemManager10GetUnk_098Ej @@ -150,7 +211,6 @@ .extern data_027e0e2c .extern data_027e0e58 .extern data_027e0e5c -.extern gMapManager .extern data_027e0f64 .extern data_027e0f68 .extern data_027e0f6c @@ -377,8 +437,6 @@ .extern func_02036da8 .extern func_020370d0 .extern func_0203d7e0 -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv -.extern _ZN9ActorTypeD1Ev .extern func_0203eba8 .extern func_0203ebc8 .extern func_02042f68 @@ -419,68 +477,10 @@ .extern func_ov00_0207c444 .extern func_ov00_0207c474 .extern func_ov00_0207c518 -.extern _ZN6Course18func_ov00_0207ca78Eici -.extern _ZN6Course14FindMapGridPosEP5Vec2bPS_j -.extern _ZN6Course18func_ov00_0207ce20EiiPci -.extern _ZN6Course23IsAdjacentMapOnMainGridEi -.extern _ZN6Course14GetAdjacentMapEi -.extern _ZN6Course18func_ov00_0207d7bcEv -.extern _ZN7MapBaseD1Ev -.extern _ZN7MapBase9SetBoundsEii -.extern _ZN7MapBase14GetMapFilePathEPcii -.extern _ZN7MapBase18func_ov00_0207ddf8Eb -.extern _ZN7MapBase18func_ov00_0207dea0Eb -.extern _ZN7MapBase8vfunc_48Ev -.extern _ZN7MapBase8vfunc_58Ev -.extern _ZN7MapBase8vfunc_64Ev -.extern _ZN7MapBase8vfunc_a4Ev -.extern _ZN7MapBase8vfunc_a8Ev -.extern _ZN7MapBase8vfunc_acEv -.extern _ZN7MapBase8vfunc_94Ev -.extern _ZN7MapBase22GetOverlappingTriggersEP5Vec3pPP11TriggerBasei -.extern _ZN7MapBase18func_ov00_02080140EP4Exit -.extern _ZN7MapBase8vfunc_bcEv -.extern _ZN7MapBase8vfunc_98Ev -.extern _ZN7MapBase8vfunc_c0Ev .extern func_ov00_02081f4c .extern func_ov00_02081f50 .extern func_ov00_02081f58 .extern func_ov00_02081f6c -.extern _ZN10MapManager18func_ov00_020823a4Ei -.extern _ZN10MapManager18func_ov00_020823b4Ev -.extern _ZN10MapManager18func_ov00_02082424Ev -.extern _ZN10MapManager18func_ov00_02082454Eii -.extern _ZN10MapManager18func_ov00_02082494Ei -.extern _ZN10MapManager18func_ov00_020824ccEi -.extern _ZN10MapManager18func_ov00_02082504Ev -.extern _ZN10MapManager18func_ov00_02082594Ev -.extern _ZN10MapManager18func_ov00_020825acEv -.extern _ZN10MapManager18func_ov00_02082650Eiii -.extern _ZN10MapManager18func_ov00_02082660Eii -.extern _ZN10MapManager18func_ov00_02082d08Ev -.extern _ZN10MapManager18func_ov00_02082d40Ev -.extern _ZN10MapManager18func_ov00_02083374Ev -.extern _ZN10MapManager18func_ov00_02083384Ev -.extern _ZN10MapManager17GetMapData_Unk_dcEP5Vec3p -.extern _ZN10MapManager17GetMapData_Unk_e8EP5Vec3p -.extern _ZN10MapManager18func_ov00_0208346cEP4AABB -.extern _ZN10MapManager18func_ov00_020836bcEjPi -.extern _ZN10MapManager18func_ov00_020836dcEii -.extern _ZN10MapManager18func_ov00_02083770Eji -.extern _ZN10MapManager18func_ov00_020838c8Ei -.extern _ZN10MapManager18func_ov00_020838d8Ei -.extern _ZN10MapManager18func_ov00_020838e8EjPi -.extern _ZN10MapManager18func_ov00_02083c24Ei -.extern _ZN10MapManager18func_ov00_02083c50Ei -.extern _ZN10MapManager16MapData_vfunc_68Ev -.extern _ZN10MapManager18func_ov00_020846a4Ev -.extern _ZN10MapManager18func_ov00_020848b8Ev -.extern _ZN10MapManager8SpawnNPCEP5Vec3pii -.extern _ZN10MapManager18func_ov00_02084b38Eiii -.extern _ZN10MapManager18func_ov00_02084cb0Ei -.extern _ZN10MapManager18func_ov00_02084cc8Ei -.extern _ZN10MapManager18func_ov00_02084d4cEiiP5Vec3p -.extern _ZN10MapManager18func_ov00_02085c60Eiiii .extern func_ov00_020872e8 .extern func_ov00_02087584 .extern func_ov00_020875f8 @@ -723,7 +723,6 @@ .extern func_ov00_020d70a4 .extern func_ov00_020d716c .extern func_ov00_020d71a0 -.extern PlaySoundEffect .extern func_ov00_020d7424 .extern func_ov00_020d74bc .extern func_ov00_020d77e4 @@ -909,5 +908,6 @@ .extern gAdventureFlags .extern gHealthManager .extern gItemManager +.extern gMapManager .extern strcat .extern strncpy diff --git a/asm/ov26.inc b/asm/ov26.inc index d963359b..4d0b53c4 100644 --- a/asm/ov26.inc +++ b/asm/ov26.inc @@ -2,6 +2,23 @@ .extern Approach_thunk .extern Divide .extern FastDivide +.extern PlaySoundEffect +.extern _ZN10MapManager16MapData_vfunc_54Ev +.extern _ZN10MapManager16MapData_vfunc_68Ev +.extern _ZN10MapManager16MapData_vfunc_b4Ev +.extern _ZN10MapManager18func_ov00_020823d4Ei +.extern _ZN10MapManager18func_ov00_020823e4Ei +.extern _ZN10MapManager18func_ov00_02082614Eii +.extern _ZN10MapManager18func_ov00_02082680Eii +.extern _ZN10MapManager18func_ov00_020826a0Eiii +.extern _ZN10MapManager18func_ov00_020836dcEii +.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p +.extern _ZN10MapManager18func_ov00_02083e34Ecci +.extern _ZN10MapManager18func_ov00_02084164Ev +.extern _ZN10MapManager18func_ov00_02084740Ev +.extern _ZN10MapManager18func_ov00_02084a50Ev +.extern _ZN10MapManager18func_ov00_02084cb0Ei +.extern _ZN10MapManager18func_ov00_02084cc8Ei .extern _ZN10PlayerBase10SetVisibleEb .extern _ZN11ItemManager7AddItemEi .extern _ZN12ActorManager13FindActorByIdEj @@ -69,6 +86,8 @@ .extern _ZN5Actor9GetHitboxEP8Cylinder .extern _ZN5ActorC2Ev .extern _ZN5ActorD2Ev +.extern _ZN9ActorTypeC1EjPFP5ActorvEPv +.extern _ZN9ActorTypeD1Ev .extern _ZN9SysObjectdlEPv .extern _ZN9SysObjectnwEmPjj .extern _ZNK11ItemManager18IsTreasureSalvagedEj @@ -94,7 +113,6 @@ .extern data_027e0d3c .extern data_027e0d78 .extern data_027e0e58 -.extern gMapManager .extern data_027e0f64 .extern data_027e0f68 .extern data_027e0f6c @@ -104,7 +122,6 @@ .extern data_027e0f94 .extern data_027e0fa0 .extern data_027e0fac -.extern gHealthManager .extern data_027e0fc8 .extern data_027e0fd4 .extern data_027e0fe0 @@ -196,8 +213,6 @@ .extern func_020352d8 .extern func_02035370 .extern func_020370d0 -.extern _ZN9ActorTypeC1EjPFP5ActorvEPv -.extern _ZN9ActorTypeD1Ev .extern func_0203eba8 .extern func_0203ebc8 .extern func_0203fe60 @@ -218,22 +233,6 @@ .extern func_ov00_0207c1f8 .extern func_ov00_0207c444 .extern func_ov00_02081f4c -.extern _ZN10MapManager18func_ov00_020823d4Ei -.extern _ZN10MapManager18func_ov00_020823e4Ei -.extern _ZN10MapManager16MapData_vfunc_b4Ev -.extern _ZN10MapManager18func_ov00_02082614Eii -.extern _ZN10MapManager18func_ov00_02082680Eii -.extern _ZN10MapManager18func_ov00_020826a0Eiii -.extern _ZN10MapManager18func_ov00_020836dcEii -.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p -.extern _ZN10MapManager18func_ov00_02083e34Ecci -.extern _ZN10MapManager16MapData_vfunc_68Ev -.extern _ZN10MapManager16MapData_vfunc_54Ev -.extern _ZN10MapManager18func_ov00_02084164Ev -.extern _ZN10MapManager18func_ov00_02084740Ev -.extern _ZN10MapManager18func_ov00_02084a50Ev -.extern _ZN10MapManager18func_ov00_02084cb0Ei -.extern _ZN10MapManager18func_ov00_02084cc8Ei .extern func_ov00_020875f8 .extern func_ov00_02087d34 .extern func_ov00_02087e8c @@ -406,7 +405,6 @@ .extern func_ov00_020d70a4 .extern func_ov00_020d716c .extern func_ov00_020d7180 -.extern PlaySoundEffect .extern func_ov00_020d73f0 .extern func_ov00_020d77e4 .extern func_ov00_020d7c8c @@ -536,6 +534,8 @@ .extern func_ov30_02183f84 .extern func_ov30_02183fd4 .extern gAdventureFlags +.extern gHealthManager .extern gItemManager +.extern gMapManager .extern strcmp .extern strncpy diff --git a/asm/ov38.inc b/asm/ov38.inc index 916faf43..6b3fc53a 100644 --- a/asm/ov38.inc +++ b/asm/ov38.inc @@ -1,6 +1,7 @@ #pragma once .extern Approach_thunk .extern Divide +.extern PlaySoundEffect .extern _ZN10MapManager18func_ov00_02084b38Eiii .extern _ZN10MapManager18func_ov00_02084be0Eii .extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j @@ -217,7 +218,6 @@ .extern func_ov00_020d5f98 .extern func_ov00_020d70a4 .extern func_ov00_020d716c -.extern PlaySoundEffect .extern func_ov00_020d73f0 .extern func_ov00_020d7c8c .extern func_ov00_020d7d18