mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-05-28 00:15:57 -04:00
Code Issues Packages Projects Releases Wiki Activity

Delink MapBase

Browse Source
This commit is contained in:
Aetias
2024-04-30 15:22:29 +02:00
parent 780b65b7a6
commit eacc6617ef
7 changed files with 4722 additions and 4706 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/ov00/Map/MapBase.inc
+85
View File
@@ -0,0 +1,85 @@
#pragma once
.extern Divide
.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
.extern _ZN6Course13FindMapCenterEi
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern data_027e0618
.extern data_027e0ce0
.extern data_027e0d38
.extern data_027e0e58
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
.extern data_027e0f78
.extern data_027e0f88
.extern data_027e0f8c
.extern data_ov00_020ecde4
.extern data_ov00_020ee0a0
.extern func_01ffe904
.extern func_01fff084
.extern func_01fff264
.extern func_020078f4
.extern func_0200c8d0
.extern func_020196bc
.extern func_020196fc
.extern func_0201e24c
.extern func_0201e4cc
.extern func_02042f68
.extern func_0204f614
.extern func_0204f754
.extern func_ov00_02078b40
.extern func_ov00_02079e3c
.extern func_ov00_02080f20
.extern func_ov00_02080f64
.extern func_ov00_02080f94
.extern func_ov00_02080ff8
.extern func_ov00_02081040
.extern func_ov00_02081070
.extern func_ov00_020810b8
.extern func_ov00_020810e8
.extern func_ov00_02081130
.extern func_ov00_02087dd8
.extern func_ov00_0208b79c
.extern func_ov00_0208d820
.extern func_ov00_0208ee00
.extern func_ov00_02095554
.extern func_ov00_0209564c
.extern func_ov00_0209581c
.extern func_ov00_02095d58
.extern func_ov00_0209c08c
.extern func_ov00_0209c1e4
.extern func_ov00_0209c2b4
.extern func_ov00_0209c2d0
.extern func_ov00_0209c530
.extern func_ov00_0209c61c
.extern func_ov00_0209c788
.extern func_ov00_0209c8e4
.extern func_ov00_0209cc3c
.extern func_ov00_0209cc48
.extern func_ov00_0209cd80
.extern func_ov00_0209cd9c
.extern func_ov00_0209cddc
.extern func_ov00_0209cdf8
.extern func_ov00_020a1a0c
.extern func_ov00_020a3de0
.extern func_ov00_020a5e9c
.extern func_ov04_0210bfa8
.extern func_ov04_0210c1f8
.extern func_ov04_0210c3fc
.extern func_ov04_0210c52c
.extern func_ov04_0210c5cc
.extern func_ov04_0210c764
.extern func_ov04_0210c800
.extern func_ov04_0210c88c
.extern func_ov04_0210c8d4
.extern func_ov04_0210ca84
.extern func_ov04_0210cb00
.extern func_ov04_0210cb1c
.extern func_ov04_0210dd90
.extern func_ov05_02111bc0
.extern func_ov05_02111c00
.extern func_ov05_02111c6c
.extern func_ov05_02111c70
.extern gMapManager
.extern strcmp
asm/ov00/Map/MapBase.s
+4626
View File
File diff suppressed because it is too large Load Diff
asm/ov00/ov00_0207afa0.s
-246
View File
@@ -6128,249 +6128,3 @@ data_ov00_020ec7ef:
.global data_ov00_020ec7f0
data_ov00_020ec7f0:
.space 0x2c
.global data_ov00_020ec81c
data_ov00_020ec81c:
.space 0x4
.global data_ov00_020ec820
data_ov00_020ec820:
.space 0x4
.global data_ov00_020ec824
data_ov00_020ec824:
.space 0x4
.global data_ov00_020ec828
data_ov00_020ec828:
.space 0x4
.global data_ov00_020ec82c
data_ov00_020ec82c:
.space 0x4
.global data_ov00_020ec830
data_ov00_020ec830:
.space 0x4
.global data_ov00_020ec834
data_ov00_020ec834:
.space 0x4
.global data_ov00_020ec838
data_ov00_020ec838:
.space 0x4
.global data_ov00_020ec83c
data_ov00_020ec83c:
.space 0x4
.global data_ov00_020ec840
data_ov00_020ec840:
.space 0x4
.global data_ov00_020ec844
data_ov00_020ec844:
.space 0x4
.global data_ov00_020ec848
data_ov00_020ec848:
.space 0x4
.global data_ov00_020ec84c
data_ov00_020ec84c:
.space 0x4
.global data_ov00_020ec850
data_ov00_020ec850:
.space 0x4
.global data_ov00_020ec854
data_ov00_020ec854:
.space 0x4
.global data_ov00_020ec858
data_ov00_020ec858:
.space 0x4
.global data_ov00_020ec85c
data_ov00_020ec85c:
.space 0x4
.global data_ov00_020ec860
data_ov00_020ec860:
.space 0x4
.global data_ov00_020ec864
data_ov00_020ec864:
.space 0x4
.global data_ov00_020ec868
data_ov00_020ec868:
.space 0x4
.global data_ov00_020ec86c
data_ov00_020ec86c:
.space 0x4
.global data_ov00_020ec870
data_ov00_020ec870:
.space 0x4
.global data_ov00_020ec874
data_ov00_020ec874:
.space 0x4
.global data_ov00_020ec878
data_ov00_020ec878:
.space 0x4
.global data_ov00_020ec87c
data_ov00_020ec87c:
.space 0x4
.global data_ov00_020ec880
data_ov00_020ec880:
.space 0x4
.global data_ov00_020ec884
data_ov00_020ec884:
.space 0x4
.global data_ov00_020ec888
data_ov00_020ec888:
.space 0x4
.global data_ov00_020ec88c
data_ov00_020ec88c:
.space 0x4
.global data_ov00_020ec890
data_ov00_020ec890:
.space 0x4
.global data_ov00_020ec894
data_ov00_020ec894:
.space 0x4
.global data_ov00_020ec898
data_ov00_020ec898:
.space 0x4
.global data_ov00_020ec89c
data_ov00_020ec89c:
.space 0x4
.global data_ov00_020ec8a0
data_ov00_020ec8a0:
.space 0x4
.global data_ov00_020ec8a4
data_ov00_020ec8a4:
.space 0x4
.global data_ov00_020ec8a8
data_ov00_020ec8a8:
.space 0x4
.global data_ov00_020ec8ac
data_ov00_020ec8ac:
.space 0x4
.global data_ov00_020ec8b0
data_ov00_020ec8b0:
.space 0x4
.global data_ov00_020ec8b4
data_ov00_020ec8b4:
.space 0x4
.global data_ov00_020ec8b8
data_ov00_020ec8b8:
.space 0x4
.global data_ov00_020ec8bc
data_ov00_020ec8bc:
.space 0x4
.global data_ov00_020ec8c0
data_ov00_020ec8c0:
.space 0x4
.global data_ov00_020ec8c4
data_ov00_020ec8c4:
.space 0x4
.global data_ov00_020ec8c8
data_ov00_020ec8c8:
.space 0x4
.global data_ov00_020ec8cc
data_ov00_020ec8cc:
.space 0x4
.global data_ov00_020ec8d0
data_ov00_020ec8d0:
.space 0x4
.global data_ov00_020ec8d4
data_ov00_020ec8d4:
.space 0x4
.global data_ov00_020ec8d8
data_ov00_020ec8d8:
.space 0x4
.global data_ov00_020ec8dc
data_ov00_020ec8dc:
.space 0x4
.global data_ov00_020ec8e0
data_ov00_020ec8e0:
.space 0x4
.global data_ov00_020ec8e4
data_ov00_020ec8e4:
.space 0x4
.global data_ov00_020ec8e8
data_ov00_020ec8e8:
.space 0x4
.global data_ov00_020ec8ec
data_ov00_020ec8ec:
.space 0x4
.global data_ov00_020ec8f0
data_ov00_020ec8f0:
.space 0x4
.global data_ov00_020ec8f4
data_ov00_020ec8f4:
.space 0x4
.global data_ov00_020ec8f8
data_ov00_020ec8f8:
.space 0x4
.global data_ov00_020ec8fc
data_ov00_020ec8fc:
.space 0x4
.global data_ov00_020ec900
data_ov00_020ec900:
.space 0x4
.global data_ov00_020ec904
data_ov00_020ec904:
.space 0x4
.global data_ov00_020ec908
data_ov00_020ec908:
.space 0x4
.global data_ov00_020ec90c
data_ov00_020ec90c:
.space 0x4
.global data_ov00_020ec910
data_ov00_020ec910:
.space 0x4
.global data_ov00_020ec914
data_ov00_020ec914:
.space 0x4
.global data_ov00_020ec918
data_ov00_020ec918:
.space 0x4
.global data_ov00_020ec91c
data_ov00_020ec91c:
.space 0x4
.global data_ov00_020ec920
data_ov00_020ec920:
.space 0x4
.global data_ov00_020ec924
data_ov00_020ec924:
.space 0x4
.global data_ov00_020ec928
data_ov00_020ec928:
.space 0x4
.global data_ov00_020ec92c
data_ov00_020ec92c:
.space 0x4
.global data_ov00_020ec930
data_ov00_020ec930:
.space 0x4
.global data_ov00_020ec934
data_ov00_020ec934:
.space 0x4
.global data_ov00_020ec938
data_ov00_020ec938:
.space 0x4
.global data_ov00_020ec93c
data_ov00_020ec93c:
.space 0x4
.global data_ov00_020ec940
data_ov00_020ec940:
.space 0x4
.global data_ov00_020ec944
data_ov00_020ec944:
.space 0x4
.global data_ov00_020ec948
data_ov00_020ec948:
.space 0x4
.global data_ov00_020ec94c
data_ov00_020ec94c:
.space 0x4
.global data_ov00_020ec950
data_ov00_020ec950:
.space 0x4
.global data_ov00_020ec954
data_ov00_020ec954:
.space 0x4
.global data_ov00_020ec958
data_ov00_020ec958:
.space 0x4
.global data_ov00_020ec95c
data_ov00_020ec95c:
.space 0x4
.global data_ov00_020ec960
data_ov00_020ec960:
.space 0x4
asm/ov00/ov00_0207da38.inc
-78
View File
@@ -1,86 +1,8 @@
#pragma once
.extern Divide
.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
.extern _ZN6Course13FindMapCenterEi
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern data_027e0618
.extern data_027e0ce0
.extern data_027e0d38
.extern data_027e0e58
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
.extern data_027e0f78
.extern data_027e0f88
.extern data_027e0f8c
.extern data_ov00_020ec81c
.extern data_ov00_020ec824
.extern data_ov00_020ec864
.extern data_ov00_020ec8a4
.extern data_ov00_020ec8e4
.extern data_ov00_020ec924
.extern data_ov00_020ecde4
.extern data_ov00_020ee0a0
.extern func_01ffe904
.extern func_01fff084
.extern func_01fff264
.extern func_020078f4
.extern func_0200c8d0
.extern func_020196bc
.extern func_020196fc
.extern func_0201e24c
.extern func_0201e4cc
.extern func_02042f68
.extern func_02043594
.extern func_020435b4
.extern func_02043600
.extern func_0204dd9c
.extern func_0204f614
.extern func_0204f754
.extern func_ov00_02078b40
.extern func_ov00_02079e3c
.extern func_ov00_02087dd8
.extern func_ov00_0208b79c
.extern func_ov00_0208d820
.extern func_ov00_0208ee00
.extern func_ov00_02095554
.extern func_ov00_0209564c
.extern func_ov00_0209581c
.extern func_ov00_02095d58
.extern func_ov00_0209c08c
.extern func_ov00_0209c1e4
.extern func_ov00_0209c2b4
.extern func_ov00_0209c2d0
.extern func_ov00_0209c530
.extern func_ov00_0209c61c
.extern func_ov00_0209c788
.extern func_ov00_0209c8e4
.extern func_ov00_0209cc3c
.extern func_ov00_0209cc48
.extern func_ov00_0209cd80
.extern func_ov00_0209cd9c
.extern func_ov00_0209cddc
.extern func_ov00_0209cdf8
.extern func_ov00_020a1a0c
.extern func_ov00_020a3de0
.extern func_ov00_020a5e9c
.extern func_ov04_0210bfa8
.extern func_ov04_0210c1f8
.extern func_ov04_0210c3fc
.extern func_ov04_0210c52c
.extern func_ov04_0210c5cc
.extern func_ov04_0210c764
.extern func_ov04_0210c800
.extern func_ov04_0210c88c
.extern func_ov04_0210c8d4
.extern func_ov04_0210ca84
.extern func_ov04_0210cb00
.extern func_ov04_0210cb1c
.extern func_ov04_0210dd90
.extern func_ov05_02111bc0
.extern func_ov05_02111c00
.extern func_ov05_02111c6c
.extern func_ov05_02111c70
.extern gMapManager
.extern strcmp
asm/ov00/ov00_0207da38.s
-4373
View File
File diff suppressed because it is too large Load Diff
asm/ov00/ov00_02086cd0.inc
+9 -9
View File
@@ -34,6 +34,11 @@
.extern _ZN10MapManager18func_ov00_02084b38Eiii
.extern _ZN10MapManager18func_ov00_02084be0Eii
.extern _ZN10MapManager18func_ov00_02084d24Ecci
.extern _ZN11TriggerBase14GetBoundingBoxEv
.extern _ZN11TriggerBase8OverlapsEv
.extern _ZN11TriggerBase8vfunc_08Ev
.extern _ZN11TriggerBase8vfunc_0cEv
.extern _ZN11TriggerBase8vfunc_10Ev
.extern _ZN12ActorManager12FilterActorsEP15ActorFilterBaseP9ActorList
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager18func_ov00_020c3b2cEPi
@@ -91,6 +96,10 @@
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN7MapBase18func_ov00_0207e940EPc
.extern _ZN7MapBase18func_ov00_0207e968Ev
.extern _ZN7MapBase18func_ov00_0207e96cEv
.extern _ZN7MapBase18func_ov00_0207f100Ev
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern _ZN9SysObjectdlEPv
@@ -223,15 +232,6 @@
.extern func_ov00_02079008
.extern func_ov00_02079470
.extern func_ov00_02079680
.extern _ZN7MapBase18func_ov00_0207e940EPc
.extern _ZN7MapBase18func_ov00_0207e968Ev
.extern _ZN7MapBase18func_ov00_0207e96cEv
.extern _ZN7MapBase18func_ov00_0207f100Ev
.extern _ZN11TriggerBase8vfunc_08Ev
.extern _ZN11TriggerBase14GetBoundingBoxEv
.extern _ZN11TriggerBase8OverlapsEv
.extern _ZN11TriggerBase8vfunc_0cEv
.extern _ZN11TriggerBase8vfunc_10Ev
.extern func_ov00_02081f4c
.extern func_ov00_02081f6c
.extern func_ov00_0209afc4
tools/lcf.py
+2
View File
@@ -41,6 +41,8 @@ ov00 = Overlay(name='ov00', after='ARM9', objects=[
'asm/ov00/Map/Course.s',
'src/00_Core/Map/Course.cpp',
'asm/ov00/Map/MapBase.s',
'src/00_Core/Map/MapBase.cpp',
'asm/ov00/ov00_0207da38.s',