mirror/ph
1
0
Fork 0
mirror of https://github.com/zeldaret/ph synced 2026-06-01 09:47:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Delink Course

Browse Source
This commit is contained in:
Aetias
2024-04-23 00:30:20 +02:00
parent b9e9392f29
commit a8c5c49efa
28 changed files with 17894 additions and 17866 deletions
Download Patch File Download Diff File Expand all files Collapse all files
asm/main/main_02000000.inc
+5 -5
View File
@@ -1,5 +1,9 @@
#pragma once
.extern Divide
.extern _ZN10MapManager18func_ov00_02082614Eii
.extern _ZN10MapManager18func_ov00_020838e8EjPi
.extern _ZN10MapManager18func_ov00_02084740Ev
.extern _ZN10MapManager18func_ov00_02086044Eiii
.extern _ZN11ItemManager10GiveRupeesEjj
.extern _ZN11ItemManager7AddItemEi
.extern _ZN11ItemManager8GiveKeysEj
@@ -111,7 +115,6 @@
.extern data_027e0dbc
.extern data_027e0e28
.extern data_027e0e2c
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f7c
.extern data_027e0f80
@@ -375,10 +378,6 @@
.extern func_ov00_0207bcb4
.extern func_ov00_0207be84
.extern func_ov00_0207c0f0
.extern _ZN10MapManager18func_ov00_02082614Eii
.extern _ZN10MapManager18func_ov00_020838e8EjPi
.extern _ZN10MapManager18func_ov00_02084740Ev
.extern _ZN10MapManager18func_ov00_02086044Eiii
.extern func_ov00_02087d98
.extern func_ov00_02089068
.extern func_ov00_0208b180
@@ -477,6 +476,7 @@
.extern gAdventureFlags
.extern gHeap
.extern gItemManager
.extern gMapManager
.extern gOverlayManager
.extern gpBuildDate
.extern strcat
asm/ov00/Map/Course.inc
+29
View File
@@ -0,0 +1,29 @@
#pragma once
.extern Divide
.extern _ZN14AdventureFlags3GetEj
.extern data_027e0d38
.extern data_027e0f7c
.extern data_027e103c
.extern data_ov00_020e233c
.extern data_ov00_020e2508
.extern data_ov00_020e250c
.extern func_02002c14
.extern func_0200c8d0
.extern func_ov00_020972e4
.extern func_ov00_0209740c
.extern func_ov00_02097458
.extern func_ov00_02097478
.extern func_ov00_020974c4
.extern func_ov00_020974e4
.extern func_ov00_02097530
.extern func_ov00_02097550
.extern func_ov00_0209759c
.extern func_ov00_020975bc
.extern func_ov00_02097608
.extern func_ov00_0209d71c
.extern func_ov00_020a3510
.extern func_ov00_020a3710
.extern func_ov00_020a5e9c
.extern func_ov00_020cf414
.extern gAdventureFlags
.extern strcpy
asm/ov00/Map/Course.s
+1459
View File
File diff suppressed because it is too large Load Diff
asm/ov00/Map/MapManager.inc
+38 -36
View File
@@ -3,6 +3,41 @@
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager18func_ov00_020c3ce8Eii
.extern _ZN14AdventureFlags18func_ov00_020976c8Ev
.extern _ZN6Course15GetUnk_c8_Unk_4Ev
.extern _ZN6Course18GetDungeonProgressEP14CourseProgress
.extern _ZN6Course18func_ov00_0207ca28Eiii
.extern _ZN6Course18func_ov00_0207caa8Eiii
.extern _ZN6Course18func_ov00_0207cb30Ei
.extern _ZN6Course18func_ov00_0207cb7cEiPS_i
.extern _ZN6Course18func_ov00_0207cbd8Ei
.extern _ZN6Course18func_ov00_0207cbe8Ei
.extern _ZN6Course18func_ov00_0207cc24Ei
.extern _ZN6Course18func_ov00_0207cc6cEv
.extern _ZN6Course18func_ov00_0207ce20Eiiii
.extern _ZN6Course18func_ov00_0207d404Eiii
.extern _ZN6Course18func_ov00_0207d47cEv
.extern _ZN6Course18func_ov00_0207d4e4Ei
.extern _ZN6Course18func_ov00_0207d518EiPiS0_
.extern _ZN6Course18func_ov00_0207d5c4Ev
.extern _ZN6Course18func_ov00_0207d5f0Ev
.extern _ZN6Course18func_ov00_0207d61cEv
.extern _ZN6Course18func_ov00_0207d778Ev
.extern _ZN6Course18func_ov00_0207d788Ev
.extern _ZN6Course18func_ov00_0207d7bcEv
.extern _ZN6Course18func_ov00_0207d7dcEii
.extern _ZN6Course18func_ov00_0207d828Ei
.extern _ZN6Course18func_ov00_0207d848Eii
.extern _ZN6Course18func_ov00_0207d894Ei
.extern _ZN6Course18func_ov00_0207d8b4Ev
.extern _ZN6Course18func_ov00_0207d8d4Ei
.extern _ZN6Course18func_ov00_0207d8ecEv
.extern _ZN6Course18func_ov00_0207d90cEi
.extern _ZN6Course18func_ov00_0207d924Ev
.extern _ZN6Course18func_ov00_0207d944Ei
.extern _ZN6Course18func_ov00_0207d95cEv
.extern _ZN6Course18func_ov00_0207d97cEi
.extern _ZN6Course18func_ov00_0207d994Ev
.extern _ZN6Course18func_ov00_0207d9b4Ei
.extern _ZN9SysObjectnwEmPjj
.extern __register_global_object
.extern data_027e077c
@@ -10,7 +45,6 @@
.extern data_027e0ce0
.extern data_027e0d38
.extern data_027e0d3c
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
@@ -46,41 +80,7 @@
.extern func_ov00_020792a0
.extern func_ov00_02079898
.extern func_ov00_020798bc
.extern _ZN6Course18GetDungeonProgressEP14CourseProgress
.extern _ZN6Course18func_ov00_0207ca28Eiii
.extern _ZN6Course18func_ov00_0207caa8Eiii
.extern _ZN6Course18func_ov00_0207cb30Ei
.extern _ZN6Course18func_ov00_0207cb7cEiPS_i
.extern _ZN6Course18func_ov00_0207cbd8Ei
.extern _ZN6Course18func_ov00_0207cbe8Ei
.extern _ZN6Course18func_ov00_0207cc24Ei
.extern _ZN6Course18func_ov00_0207cc6cEv
.extern _ZN6Course18func_ov00_0207ce20Eiiii
.extern _ZN6Course18func_ov00_0207d404Eiii
.extern _ZN6Course18func_ov00_0207d47cEv
.extern _ZN6Course18func_ov00_0207d4e4Ei
.extern _ZN6Course18func_ov00_0207d518EiPiS0_
.extern _ZN6Course18func_ov00_0207d5c4Ev
.extern _ZN6Course18func_ov00_0207d5f0Ev
.extern _ZN6Course18func_ov00_0207d61cEv
.extern _ZN6Course15GetUnk_c8_Unk_4Ev
.extern _ZN6Course18func_ov00_0207d778Ev
.extern _ZN6Course18func_ov00_0207d788Ev
.extern _ZN6Course18func_ov00_0207d7bcEv
.extern _ZN6Course18func_ov00_0207d7dcEii
.extern _ZN6Course18func_ov00_0207d828Ei
.extern _ZN6Course18func_ov00_0207d848Eii
.extern _ZN6Course18func_ov00_0207d894Ei
.extern _ZN6Course18func_ov00_0207d8b4Ev
.extern _ZN6Course18func_ov00_0207d8d4Ei
.extern _ZN6Course18func_ov00_0207d8ecEv
.extern _ZN6Course18func_ov00_0207d90cEi
.extern _ZN6Course18func_ov00_0207d924Ev
.extern _ZN6Course18func_ov00_0207d944Ei
.extern _ZN6Course18func_ov00_0207d95cEv
.extern _ZN6Course18func_ov00_0207d97cEi
.extern _ZN6Course18func_ov00_0207d994Ev
.extern _ZN6Course18func_ov00_0207d9b4Ei
.extern func_ov00_0207dd9c
.extern func_ov00_0207de68
.extern func_ov00_0207de88
.extern func_ov00_0207e08c
@@ -128,6 +128,7 @@
.extern func_ov00_02080b24
.extern func_ov00_02080d08
.extern func_ov00_02080d80
.extern func_ov00_02086cd0
.extern func_ov00_02088000
.extern func_ov00_02088130
.extern func_ov00_02088144
@@ -176,3 +177,4 @@
.extern func_ov17_0215b4e8
.extern func_ov18_0215b4a0
.extern gAdventureFlags
.extern gMapManager
asm/ov00/Map/MapManager.s
+105
View File
@@ -6467,6 +6467,111 @@ data_ov00_020d8aa0: ; 0x020d8aa0
data_ov00_020d8aa4: ; 0x020d8aa4
.byte 0x9a, 0x01, 0x00, 0x00
.section .init, 4, 1, 4
.global func_ov00_020df4cc
arm_func_start func_ov00_020df4cc
func_ov00_020df4cc: ; 0x020df4cc
stmdb sp!, {r3, lr}
ldr r0, _020df5f0 ; =0x00005fff
ldr r3, _020df5f4 ; =data_ov00_020e24a4
mov ip, #0
str r0, [r3, #0x20]
ldr r0, _020df5f8 ; =data_ov00_020e24c8
ldr r1, _020df5fc ; =func_ov00_02086cd0
ldr r2, _020df600 ; =data_ov00_020ec964
str ip, [r3, #0x24]
mov ip, #0x60
str ip, [r3, #0x28]
bl __register_global_object
ldr r0, _020df604 ; =data_ov00_020e24d0
mov r3, #0
ldr r1, _020df5fc ; =func_ov00_02086cd0
ldr r2, _020df608 ; =data_ov00_020ec970
str r3, [r0]
str r3, [r0, #4]
bl __register_global_object
ldr r0, _020df60c ; =data_ov00_020e24d8
mov ip, #0x80
mov r3, #0x60
ldr r1, _020df5fc ; =func_ov00_02086cd0
ldr r2, _020df610 ; =data_ov00_020ec97c
str ip, [r0]
str r3, [r0, #4]
bl __register_global_object
ldr r0, _020df614 ; =data_ov00_020e24e0
mov ip, #0x80
mov r3, #0
ldr r1, _020df5fc ; =func_ov00_02086cd0
ldr r2, _020df618 ; =data_ov00_020ec988
str ip, [r0]
str r3, [r0, #4]
bl __register_global_object
mov r2, #0x80000
rsb r2, r2, #0
ldr r0, _020df5f4 ; =data_ov00_020e24a4
add r1, r2, #0x20000
str r2, [r0, #0x44]
str r1, [r0, #0x48]
ldr r0, _020df61c ; =data_ov00_020e24e8
ldr r1, _020df620 ; =func_ov00_0207dd9c
ldr r2, _020df624 ; =data_ov00_020ec994
bl __register_global_object
ldr r0, _020df628 ; =data_ov00_020e24f0
mov r1, #0x80000
rsb r1, r1, #0
str r1, [r0]
add r1, r1, #0x20000
str r1, [r0, #4]
ldr r1, _020df620 ; =func_ov00_0207dd9c
ldr r2, _020df62c ; =data_ov00_020ec9a0
bl __register_global_object
ldr r0, _020df630 ; =data_ov00_020e24f8
mov r1, #0x80000
rsb r1, r1, #0
str r1, [r0]
add r1, r1, #0x20000
str r1, [r0, #4]
ldr r1, _020df620 ; =func_ov00_0207dd9c
ldr r2, _020df634 ; =data_ov00_020ec9ac
bl __register_global_object
ldr r0, _020df638 ; =data_ov00_020e2500
mov r1, #0x80000
rsb r1, r1, #0
str r1, [r0]
add r1, r1, #0x20000
str r1, [r0, #4]
ldr r1, _020df620 ; =func_ov00_0207dd9c
ldr r2, _020df63c ; =data_ov00_020ec9b8
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020df4cc
_020df5f0: .word 0x00005fff
_020df5f4: .word data_ov00_020e24a4
_020df5f8: .word data_ov00_020e24c8
_020df5fc: .word func_ov00_02086cd0
_020df600: .word data_ov00_020ec964
_020df604: .word data_ov00_020e24d0
_020df608: .word data_ov00_020ec970
_020df60c: .word data_ov00_020e24d8
_020df610: .word data_ov00_020ec97c
_020df614: .word data_ov00_020e24e0
_020df618: .word data_ov00_020ec988
_020df61c: .word data_ov00_020e24e8
_020df620: .word func_ov00_0207dd9c
_020df624: .word data_ov00_020ec994
_020df628: .word data_ov00_020e24f0
_020df62c: .word data_ov00_020ec9a0
_020df630: .word data_ov00_020e24f8
_020df634: .word data_ov00_020ec9ac
_020df638: .word data_ov00_020e2500
_020df63c: .word data_ov00_020ec9b8
.section .ctor, 4, 1, 4
.global data_ov00_020e1ebc
data_ov00_020e1ebc: ; 0x020e1ebc
.word func_ov00_020df4cc
.data
.global data_ov00_020e24c4
data_ov00_020e24c4: ; 0x020e24c4
asm/ov00/Player/TouchControl.inc
+5
View File
@@ -1,3 +1,8 @@
#pragma once
.extern GetTouchStateFlags
.extern __register_global_object
.extern data_027e0d6c
.extern data_027e0d78
.extern func_020078c0
.extern func_ov00_020df378
.extern func_ov08_02113080
asm/ov00/Player/TouchControl.s
+29
View File
@@ -294,3 +294,32 @@ _0207af84:
add sp, sp, #8
ldmia sp!, {r3, r4, r5, pc}
arm_func_end _ZN12TouchControl18func_ov00_0207af38Etb
.global _ZN12TouchControlD1Ev
arm_func_start _ZN12TouchControlD1Ev
_ZN12TouchControlD1Ev: ; 0x0207af9c
bx lr
arm_func_end _ZN12TouchControlD1Ev
.section .init, 4, 1, 4
.global func_ov00_020df38c
arm_func_start func_ov00_020df38c
func_ov00_020df38c: ; 0x020df38c
stmdb sp!, {r3, lr}
ldr r0, _020df3ac ; =data_027e0d78
bl func_ov08_02113080
ldr r0, _020df3ac ; =data_027e0d78
ldr r1, _020df3b0 ; =_ZN12TouchControlD1Ev
ldr r2, _020df3b4 ; =data_027e0d6c
bl __register_global_object
ldmia sp!, {r3, pc}
.align 2, 0
arm_func_end func_ov00_020df38c
_020df3ac: .word data_027e0d78
_020df3b0: .word _ZN12TouchControlD1Ev - 1
_020df3b4: .word data_027e0d6c
.section .ctor, 4, 1, 4
.global data_ov00_020e1e90
data_ov00_020e1e90: ; 0x020e1e90
.word func_ov00_020df378
asm/ov00/ov00_020773c0.inc
+13 -12
View File
@@ -1,9 +1,19 @@
#pragma once
.extern Divide
.extern WaitByLoop
.extern _ZN10MapManager13GetCourseMaxXEv
.extern _ZN10MapManager13GetCourseMaxZEv
.extern _ZN10MapManager13GetCourseMinXEv
.extern _ZN10MapManager13GetCourseMinZEv
.extern _ZN10MapManager18func_ov00_02082e1cEPiS0_
.extern _ZN10MapManager18func_ov00_0208306cEv
.extern _ZN10MapManager18func_ov00_02083588Ev
.extern _ZN10MapManager18func_ov00_020849c0Ev
.extern _ZN14AdventureFlags15Get_FlagsUnk_48Ei
.extern _ZN14OverlayManager15LoadIfNotLoadedEjj
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern __register_global_object
.extern data_02000ba0
.extern data_02056be4
.extern data_0205750c
@@ -26,9 +36,7 @@
.extern data_027e0d48
.extern data_027e0d54
.extern data_027e0e28
.extern gMapManager
.extern data_027e0f64
.extern gAdventureFlags
.extern data_027e0f7c
.extern data_027e1054
.extern data_ov00_020ec718
@@ -127,19 +135,9 @@
.extern func_020426d4
.extern func_02042bb8
.extern func_0204366c
.extern __register_global_object
.extern func_ov00_0207bc48
.extern func_ov00_0207c170
.extern _ZN10MapManager18func_ov00_02082e1cEPiS0_
.extern _ZN10MapManager18func_ov00_0208306cEv
.extern _ZN10MapManager13GetCourseMinXEv
.extern _ZN10MapManager13GetCourseMinZEv
.extern _ZN10MapManager13GetCourseMaxXEv
.extern _ZN10MapManager13GetCourseMaxZEv
.extern _ZN10MapManager18func_ov00_02083588Ev
.extern _ZN10MapManager18func_ov00_020849c0Ev
.extern func_ov00_02088074
.extern _ZN14AdventureFlags15Get_FlagsUnk_48Ei
.extern func_ov00_0209d738
.extern func_ov00_0209d758
.extern func_ov00_0209d768
@@ -155,10 +153,13 @@
.extern func_ov03_020f4b7c
.extern func_ov04_02100b6c
.extern func_ov08_02112ee0
.extern func_ov08_02113a0c
.extern func_ov08_02113a40
.extern func_ov09_021136c4
.extern func_ov09_0211d860
.extern func_ov09_0211d8a0
.extern func_ov29_02178f1c
.extern gAdventureFlags
.extern gMapManager
.extern gOverlayManager
.extern strncmp
asm/ov00/ov00_020773c0.s
+1745
View File
File diff suppressed because it is too large Load Diff
asm/ov00/ov00_0207af9c.inc
-257
View File
@@ -1,257 +0,0 @@
#pragma once
.extern Divide
.extern _ZN10MapManager18func_ov00_02082d08Ev
.extern _ZN10MapManager18func_ov00_02083318Ei
.extern _ZN10MapManager18func_ov00_02083328Ev
.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN14AdventureFlags18func_ov00_020980d0Ev
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14OverlayManager15LoadIfNotLoadedEjj
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager7HasItemEi
.extern __register_global_object
.extern data_02056be4
.extern data_020691a0
.extern data_027e037c
.extern data_027e0384
.extern data_027e03c8
.extern data_027e0618
.extern data_027e071c
.extern data_027e077c
.extern data_027e0c54
.extern data_027e0cbc
.extern data_027e0ce0
.extern data_027e0d38
.extern data_027e0d54
.extern data_027e0d6c
.extern data_027e0d78
.extern data_027e0db0
.extern data_027e0db4
.extern data_027e0db8
.extern data_027e0dbc
.extern data_027e0de4
.extern data_027e0de8
.extern data_027e0e08
.extern data_027e0e28
.extern data_027e0e2c
.extern data_027e0e58
.extern data_027e0e5c
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
.extern data_027e0f78
.extern data_027e0f7c
.extern data_027e0f88
.extern data_027e0f8c
.extern data_027e0f94
.extern data_027e0fac
.extern data_027e0fcc
.extern data_027e0fe4
.extern data_027e103c
.extern data_ov00_020dbf88
.extern data_ov00_020e24c8
.extern data_ov00_020e24d0
.extern data_ov00_020e24d8
.extern data_ov00_020e24e0
.extern data_ov00_020e24e8
.extern data_ov00_020e24f0
.extern data_ov00_020e24f8
.extern data_ov00_020e2500
.extern data_ov00_020e2508
.extern data_ov00_020e250c
.extern data_ov00_020e2fa8
.extern data_ov00_020e30ec
.extern data_ov00_020e31ec
.extern data_ov00_020e32ec
.extern data_ov00_020e33ec
.extern data_ov00_020e34ec
.extern data_ov00_020e35ec
.extern data_ov00_020e36ec
.extern data_ov00_020e37ec
.extern data_ov00_020e38ec
.extern data_ov00_020e39ec
.extern data_ov00_020ec964
.extern data_ov00_020ec970
.extern data_ov00_020ec97c
.extern data_ov00_020ec988
.extern data_ov00_020ec994
.extern data_ov00_020ec9a0
.extern data_ov00_020ec9ac
.extern data_ov00_020ec9b8
.extern data_ov00_020ecd50
.extern data_ov00_020ecd58
.extern data_ov00_020ecd64
.extern data_ov00_020ecd70
.extern data_ov00_020ecd84
.extern data_ov00_020ecd90
.extern data_ov00_020ecda4
.extern data_ov00_020ecdb0
.extern data_ov00_020ecdc4
.extern data_ov00_020ecdcc
.extern data_ov00_020ecdd8
.extern data_ov00_020ecde4
.extern data_ov00_020edde4
.extern data_ov00_020ee094
.extern data_ov00_020ee0a0
.extern data_ov09_0211f5dc
.extern func_01ff892c
.extern func_01ff9b4c
.extern func_01ff9ec0
.extern func_01ffa8d4
.extern func_01ffe468
.extern func_01ffe904
.extern func_01fff084
.extern func_01fff264
.extern func_02002c14
.extern func_02004730
.extern func_020047d8
.extern func_02004a3c
.extern func_02004a50
.extern func_02004dac
.extern func_020052e4
.extern func_02005628
.extern func_02005b58
.extern func_02006060
.extern func_02006b14
.extern func_02006b2c
.extern func_02006b90
.extern func_020078c0
.extern func_020078d8
.extern func_020078f4
.extern func_02007938
.extern func_02007984
.extern func_02007ad8
.extern func_0200be04
.extern func_0200c8d0
.extern func_0200e2c0
.extern func_02012830
.extern func_020128bc
.extern func_02012934
.extern func_020196bc
.extern func_020196fc
.extern func_0201e24c
.extern func_0201e4cc
.extern func_02023b3c
.extern func_02024130
.extern func_0202ab78
.extern func_0202abdc
.extern func_0202c69c
.extern func_0202d56c
.extern func_0202d77c
.extern func_0203eba8
.extern func_0203ebc8
.extern func_02040464
.extern func_02042b40
.extern func_02042bfc
.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_02078b88
.extern func_ov00_02079e04
.extern func_ov00_02079e3c
.extern func_ov00_02086cd0
.extern func_ov00_02087dd8
.extern func_ov00_0208b79c
.extern func_ov00_0208d820
.extern func_ov00_0208ee00
.extern func_ov00_0208f69c
.extern func_ov00_0208fa70
.extern func_ov00_020903a8
.extern func_ov00_020904f4
.extern func_ov00_02093c9c
.extern func_ov00_02095554
.extern func_ov00_0209564c
.extern func_ov00_0209581c
.extern func_ov00_02095d58
.extern func_ov00_020972e4
.extern func_ov00_0209740c
.extern func_ov00_02097458
.extern func_ov00_02097478
.extern func_ov00_020974c4
.extern func_ov00_020974e4
.extern func_ov00_02097530
.extern func_ov00_02097550
.extern func_ov00_0209759c
.extern func_ov00_020975bc
.extern func_ov00_02097608
.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_0209d71c
.extern func_ov00_0209d738
.extern func_ov00_0209d778
.extern func_ov00_020a1a0c
.extern func_ov00_020a3510
.extern func_ov00_020a3710
.extern func_ov00_020a3de0
.extern func_ov00_020a5e9c
.extern func_ov00_020b7e6c
.extern func_ov00_020cf13c
.extern func_ov00_020cf414
.extern func_ov03_020f3974
.extern func_ov03_020f3c28
.extern func_ov03_020fa874
.extern func_ov04_02100eb0
.extern func_ov04_02101188
.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_02100e0c
.extern func_ov05_02101080
.extern func_ov05_021010b0
.extern func_ov05_021010ec
.extern func_ov05_02111bc0
.extern func_ov05_02111c00
.extern func_ov05_02111c6c
.extern func_ov05_02111c70
.extern func_ov08_02113080
.extern func_ov08_0211351c
.extern func_ov08_021135b8
.extern func_ov08_021136fc
.extern func_ov08_02113730
.extern func_ov08_02113a0c
.extern func_ov08_02113aa8
.extern func_ov09_02114810
.extern func_ov12_02133c40
.extern func_ov17_0215cef4
.extern func_ov18_0215cb28
.extern func_ov18_0215df1c
.extern func_ov26_02173b7c
.extern func_ov40_02183dac
.extern gAdventureFlags
.extern gItemManager
.extern gOverlayManager
.extern strcmp
.extern strcpy
asm/ov00/ov00_0207af9c.s
-17482
View File
File diff suppressed because it is too large Load Diff
asm/ov00/ov00_0207afa0.inc
+113
View File
@@ -0,0 +1,113 @@
#pragma once
.extern Divide
.extern _ZN10MapManager18func_ov00_02082d08Ev
.extern _ZN10MapManager18func_ov00_02083318Ei
.extern _ZN10MapManager18func_ov00_02083328Ev
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN14OverlayManager15LoadIfNotLoadedEjj
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager7HasItemEi
.extern __register_global_object
.extern data_02056be4
.extern data_020691a0
.extern data_027e037c
.extern data_027e0384
.extern data_027e03c8
.extern data_027e0618
.extern data_027e071c
.extern data_027e077c
.extern data_027e0c54
.extern data_027e0cbc
.extern data_027e0ce0
.extern data_027e0d38
.extern data_027e0d54
.extern data_027e0db0
.extern data_027e0db4
.extern data_027e0db8
.extern data_027e0dbc
.extern data_027e0de4
.extern data_027e0de8
.extern data_027e0e08
.extern data_027e0e28
.extern data_027e0e2c
.extern data_027e0e58
.extern data_027e0e5c
.extern data_027e0f64
.extern data_027e0f7c
.extern data_027e0f94
.extern data_027e0fac
.extern data_027e0fcc
.extern data_027e0fe4
.extern data_027e103c
.extern data_ov09_0211f5dc
.extern func_01ff892c
.extern func_01ff9b4c
.extern func_01ff9ec0
.extern func_01ffa8d4
.extern func_01ffe468
.extern func_02004730
.extern func_020047d8
.extern func_02004a3c
.extern func_02004a50
.extern func_02004dac
.extern func_020052e4
.extern func_02005628
.extern func_02005b58
.extern func_02006060
.extern func_02006b14
.extern func_02006b2c
.extern func_02006b90
.extern func_020078c0
.extern func_020078d8
.extern func_02007938
.extern func_02007984
.extern func_02007ad8
.extern func_0200be04
.extern func_0200e2c0
.extern func_02012830
.extern func_020128bc
.extern func_02012934
.extern func_02023b3c
.extern func_02024130
.extern func_0202ab78
.extern func_0202abdc
.extern func_0202c69c
.extern func_0202d56c
.extern func_0202d77c
.extern func_02040464
.extern func_02042b40
.extern func_02042bfc
.extern func_0204f754
.extern func_ov00_02078b40
.extern func_ov00_02078b88
.extern func_ov00_02079e04
.extern func_ov00_0209d738
.extern func_ov00_0209d778
.extern func_ov00_020a5e9c
.extern func_ov00_020b7e6c
.extern func_ov00_020cf13c
.extern func_ov00_020df38c
.extern func_ov03_020f3974
.extern func_ov03_020f3c28
.extern func_ov03_020fa874
.extern func_ov04_02100eb0
.extern func_ov04_02101188
.extern func_ov05_02100e0c
.extern func_ov05_02101080
.extern func_ov05_021010b0
.extern func_ov05_021010ec
.extern func_ov08_021136fc
.extern func_ov08_02113730
.extern func_ov08_02113aa8
.extern func_ov09_02114810
.extern func_ov12_02133c40
.extern func_ov17_0215cef4
.extern func_ov18_0215cb28
.extern func_ov18_0215df1c
.extern func_ov26_02173b7c
.extern func_ov40_02183dac
.extern gItemManager
.extern gMapManager
.extern gOverlayManager
asm/ov00/ov00_0207afa0.s
+6376
View File
File diff suppressed because it is too large Load Diff
asm/ov00/ov00_0207da38.inc
+86
View File
@@ -0,0 +1,86 @@
#pragma once
.extern Divide
.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
.extern _ZN6Course18func_ov00_0207cbd8Ei
.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
+6035
View File
File diff suppressed because it is too large Load Diff
asm/ov00/ov00_02086cd0.inc
+19 -1
View File
@@ -42,6 +42,7 @@
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN14AdventureFlags15Get_FlagsUnk_00EiP9FlagsUnk2
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags18func_ov00_020980d0Ev
.extern _ZN14AdventureFlags20Get_FlagsUnk_30_FlagEi
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor11SetVelocityEP5Vec3p
@@ -90,8 +91,11 @@
.extern _ZN5Actor8vfunc_b0Ev
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern __register_global_object
.extern data_02050f54
.extern data_02056be4
.extern data_02063e4c
@@ -103,7 +107,6 @@
.extern data_027e0d38
.extern data_027e0d3c
.extern data_027e0d44
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
@@ -122,6 +125,16 @@
.extern data_027e0fe8
.extern data_027e103c
.extern data_027e10a4
.extern data_ov00_020dbf88
.extern data_ov00_020e31ec
.extern data_ov00_020e32ec
.extern data_ov00_020e33ec
.extern data_ov00_020e34ec
.extern data_ov00_020e35ec
.extern data_ov00_020e36ec
.extern data_ov00_020e37ec
.extern data_ov00_020e38ec
.extern data_ov00_020e39ec
.extern data_ov00_020e9370
.extern data_ov00_020ea110
.extern data_ov00_020eab04
@@ -193,6 +206,8 @@
.extern func_020350b4
.extern func_0203516c
.extern func_020351b8
.extern func_0203eba8
.extern func_0203ebc8
.extern func_02042d50
.extern func_02043594
.extern func_020435b4
@@ -261,6 +276,8 @@
.extern func_ov05_02101ab8
.extern func_ov05_02102c2c
.extern func_ov05_02103f4c
.extern func_ov08_0211351c
.extern func_ov08_021135b8
.extern func_ov14_02125934
.extern func_ov14_02125948
.extern func_ov15_0214c3c4
@@ -269,3 +286,4 @@
.extern func_ov18_0216ac24
.extern func_ov18_0216ad38
.extern gAdventureFlags
.extern gMapManager
asm/ov00/ov00_02086cd0.s
+1757
View File
File diff suppressed because it is too large Load Diff
asm/ov00/ov00_020c3e54.inc
+1 -1
View File
@@ -139,7 +139,6 @@
.extern data_027e0e28
.extern data_027e0e58
.extern data_027e0e5c
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f6c
.extern data_027e0f70
@@ -670,6 +669,7 @@
.extern func_ov29_0216d918
.extern gAdventureFlags
.extern gItemManager
.extern gMapManager
.extern gOverlayManager
.extern strcat
.extern strcpy
asm/ov04.inc
+11 -11
View File
@@ -57,6 +57,16 @@
.extern _ZN14OverlayManager6UnloadEj
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN6Course13SetCourseNameEPc
.extern _ZN6Course14GetMCSFilePathEiii
.extern _ZN6Course14GetMRCFilePathEiii
.extern _ZN6Course18func_ov00_0207ca78Ev
.extern _ZN6Course18func_ov00_0207cb7cEiPS_i
.extern _ZN6Course18func_ov00_0207ce20Eiiii
.extern _ZN6Course18func_ov00_0207d4e4Ei
.extern _ZN6Course18func_ov00_0207d7a4Ev
.extern _ZN6Course18func_ov00_0207d7bcEv
.extern _ZN6Course18func_ov00_0207d9ccEi
.extern _ZN9ActorType13func_0203e7c8Ev
.extern _ZN9ActorType4FindEj
.extern _ZN9SysObjectdlEPv
@@ -107,7 +117,6 @@
.extern data_027e0e28
.extern data_027e0e58
.extern data_027e0e5c
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
@@ -428,16 +437,6 @@
.extern func_ov00_0207c000
.extern func_ov00_0207c030
.extern func_ov00_0207c074
.extern _ZN6Course13SetCourseNameEPc
.extern _ZN6Course18func_ov00_0207ca78Ev
.extern _ZN6Course18func_ov00_0207cb7cEiPS_i
.extern _ZN6Course14GetMCSFilePathEiii
.extern _ZN6Course14GetMRCFilePathEiii
.extern _ZN6Course18func_ov00_0207ce20Eiiii
.extern _ZN6Course18func_ov00_0207d4e4Ei
.extern _ZN6Course18func_ov00_0207d7a4Ev
.extern _ZN6Course18func_ov00_0207d7bcEv
.extern _ZN6Course18func_ov00_0207d9ccEi
.extern func_ov00_0207dce4
.extern func_ov00_0207dda0
.extern func_ov00_0207ddf8
@@ -713,6 +712,7 @@
.extern func_ov40_02187ba0
.extern gAdventureFlags
.extern gItemManager
.extern gMapManager
.extern gOverlayManager
.extern gPlayerAnimHandler
.extern strcat
asm/ov05.inc
+30 -30
View File
@@ -1,5 +1,28 @@
#pragma once
.extern Divide
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager16MapData_vfunc_78Ev
.extern _ZN10MapManager16MapData_vfunc_84Ev
.extern _ZN10MapManager17GetMapData_Unk_0aEv
.extern _ZN10MapManager17GetMapData_Unk_0bEv
.extern _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
.extern _ZN10MapManager18func_ov00_02082424Ev
.extern _ZN10MapManager18func_ov00_02082d08Ev
.extern _ZN10MapManager18func_ov00_02083664EP5Vec3pi
.extern _ZN10MapManager18func_ov00_020839d4Ev
.extern _ZN10MapManager18func_ov00_020839f8Ev
.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
.extern _ZN10MapManager18func_ov00_02083c24Ei
.extern _ZN10MapManager18func_ov00_02083c50Ei
.extern _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi
.extern _ZN10MapManager18func_ov00_02083e34Ecci
.extern _ZN10MapManager18func_ov00_02083f44EP5Vec3p
.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i
.extern _ZN10MapManager18func_ov00_020840a0Ecci
.extern _ZN10MapManager18func_ov00_02084740Ev
.extern _ZN10MapManager18func_ov00_020848b8Ev
.extern _ZN10MapManager18func_ov00_0208527cEv
.extern _ZN10MapManager18func_ov00_0208583cEiP5Vec3pi
.extern _ZN10PlayerBase18func_ov00_020a7c00Ei
.extern _ZN11ItemManager12GetItemModelEj
.extern _ZN11ItemManager15LoadFanfareItemEj
@@ -103,6 +126,12 @@
.extern _ZN13PlayerControl18func_ov00_020b13c4Ev
.extern _ZN13PlayerControl20UpdateUsingEquipItemEv
.extern _ZN13PlayerControl9SetUnk_80Ev
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags18func_ov00_02097750Ev
.extern _ZN14AdventureFlags18func_ov00_02097bbcEv
.extern _ZN14AdventureFlags18func_ov00_02097ff4Ebb
.extern _ZN14AdventureFlags3GetEj
.extern _ZN15LinkStateDamage18func_ov00_020ac9e4Ei
.extern _ZN15LinkStateDamage18func_ov00_020acb6cEP5Vec3pi
.extern _ZN15LinkStateDamage18func_ov00_020ace90EP5Vec3pi
@@ -159,7 +188,6 @@
.extern data_027e0e2c
.extern data_027e0e58
.extern data_027e0e5c
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
@@ -335,29 +363,6 @@
.extern func_ov00_0207dea0
.extern func_ov00_02080de8
.extern func_ov00_02081f4c
.extern _ZN10MapManager18func_ov00_02082424Ev
.extern _ZN10MapManager16MapData_vfunc_84Ev
.extern _ZN10MapManager18func_ov00_02082d08Ev
.extern _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
.extern _ZN10MapManager18func_ov00_02083664EP5Vec3pi
.extern _ZN10MapManager18func_ov00_020839d4Ev
.extern _ZN10MapManager18func_ov00_020839f8Ev
.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
.extern _ZN10MapManager18func_ov00_02083c24Ei
.extern _ZN10MapManager18func_ov00_02083c50Ei
.extern _ZN10MapManager18func_ov00_02083c7cEP5Vec3pi
.extern _ZN10MapManager18func_ov00_02083e34Ecci
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager18func_ov00_02083f44EP5Vec3p
.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i
.extern _ZN10MapManager18func_ov00_020840a0Ecci
.extern _ZN10MapManager16MapData_vfunc_78Ev
.extern _ZN10MapManager17GetMapData_Unk_0aEv
.extern _ZN10MapManager17GetMapData_Unk_0bEv
.extern _ZN10MapManager18func_ov00_02084740Ev
.extern _ZN10MapManager18func_ov00_020848b8Ev
.extern _ZN10MapManager18func_ov00_0208527cEv
.extern _ZN10MapManager18func_ov00_0208583cEiP5Vec3pi
.extern func_ov00_0208726c
.extern func_ov00_020872e8
.extern func_ov00_0208766c
@@ -373,12 +378,6 @@
.extern func_ov00_0208cb84
.extern func_ov00_0208df2c
.extern func_ov00_02095fe0
.extern _ZN14AdventureFlags18func_ov00_02097738Ev
.extern _ZN14AdventureFlags18func_ov00_02097750Ev
.extern _ZN14AdventureFlags3GetEj
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097bbcEv
.extern _ZN14AdventureFlags18func_ov00_02097ff4Ebb
.extern func_ov00_020981b8
.extern func_ov00_02098694
.extern func_ov00_02098890
@@ -577,6 +576,7 @@
.extern func_ov59_021990a4
.extern gAdventureFlags
.extern gItemManager
.extern gMapManager
.extern gOverlayManager
.extern strcmp
.extern strcpy
asm/ov14/ov14_0211f640.inc
+1 -1
View File
@@ -159,7 +159,6 @@
.extern data_027e0d44
.extern data_027e0d78
.extern data_027e0e58
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
@@ -517,5 +516,6 @@
.extern func_ov58_0219ab28
.extern gAdventureFlags
.extern gItemManager
.extern gMapManager
.extern gOverlayManager
.extern strcmp
asm/ov24.inc
+21 -21
View File
@@ -1,12 +1,29 @@
#pragma once
.extern Approach_thunk
.extern Divide
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
.extern _ZN10MapManager18Get_MapData_Unk_d0Ev
.extern _ZN10MapManager18Get_MapData_Unk_d8Ev
.extern _ZN10MapManager18func_ov00_02082680Eii
.extern _ZN10MapManager18func_ov00_020826a0Eiii
.extern _ZN10MapManager18func_ov00_02083908EcPi
.extern _ZN10MapManager18func_ov00_0208412cEv
.extern _ZN10MapManager18func_ov00_0208413cEi
.extern _ZN10MapManager18func_ov00_02084b38Eiii
.extern _ZN10MapManager18func_ov00_02084be0Eii
.extern _ZN10MapManager18func_ov00_02084d24Ecci
.extern _ZN10PlayerBase18EquipItem_vfunc_3cEP8Cylinderi
.extern _ZN12ActorManager13FindActorByIdEj
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
.extern _ZN12ActorManager18func_ov00_020c3484EP8ActorRefP5Actori
.extern _ZN12ActorManager8GetActorEP8ActorRef
.extern _ZN13PlayerControl13CheckTouchingEj
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bacEv
.extern _ZN14AdventureFlags18func_ov00_02097bbcEv
.extern _ZN14AdventureFlags18func_ov00_02098058Ev
.extern _ZN5Actor10GetAngleToEP5Vec3p
.extern _ZN5Actor10SetUnk_11bEv
.extern _ZN5Actor10SetUnk_11cEc
@@ -74,9 +91,12 @@
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager19GetActiveFairyLevelEi
.extern __register_global_object
.extern data_02050f54
.extern data_02051f54
.extern data_02057200
@@ -84,7 +104,6 @@
.extern data_027e0c68
.extern data_027e0d0c
.extern data_027e0e58
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
@@ -149,13 +168,10 @@
.extern func_0202bbbc
.extern func_0202e310
.extern func_0202e58c
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern func_0203eba8
.extern func_0203ebc8
.extern func_0204f614
.extern func_0204f754
.extern __register_global_object
.extern func_ov00_02079e68
.extern func_ov00_0207a188
.extern func_ov00_0207a1c8
@@ -163,18 +179,6 @@
.extern func_ov00_0207c1b0
.extern func_ov00_0207c2e8
.extern func_ov00_02081f4c
.extern _ZN10MapManager18func_ov00_02082680Eii
.extern _ZN10MapManager18func_ov00_020826a0Eiii
.extern _ZN10MapManager18Get_MapData_Unk_d0Ev
.extern _ZN10MapManager18Get_MapData_Unk_d8Ev
.extern _ZN10MapManager17GetMapData_Unk_d0EP5Vec3p
.extern _ZN10MapManager18func_ov00_02083908EcPi
.extern _ZN10MapManager16MapData_vfunc_68Ev
.extern _ZN10MapManager18func_ov00_0208412cEv
.extern _ZN10MapManager18func_ov00_0208413cEi
.extern _ZN10MapManager18func_ov00_02084b38Eiii
.extern _ZN10MapManager18func_ov00_02084be0Eii
.extern _ZN10MapManager18func_ov00_02084d24Ecci
.extern func_ov00_020876bc
.extern func_ov00_02088158
.extern func_ov00_0208b180
@@ -223,11 +227,6 @@
.extern func_ov00_02093a5c
.extern func_ov00_02093af0
.extern func_ov00_02094824
.extern _ZN14AdventureFlags18func_Ov00_02097810Ei
.extern _ZN14AdventureFlags18func_ov00_02097b9cEv
.extern _ZN14AdventureFlags18func_ov00_02097bacEv
.extern _ZN14AdventureFlags18func_ov00_02097bbcEv
.extern _ZN14AdventureFlags18func_ov00_02098058Ev
.extern func_ov00_0209a4f4
.extern func_ov00_0209a508
.extern func_ov00_020a61ac
@@ -425,4 +424,5 @@
.extern func_ov17_0216a734
.extern gAdventureFlags
.extern gItemManager
.extern gMapManager
.extern strncpy
asm/ov29.inc
+1 -1
View File
@@ -90,7 +90,6 @@
.extern data_027e0d38
.extern data_027e0db0
.extern data_027e0e58
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f68
.extern data_027e0f6c
@@ -391,4 +390,5 @@
.extern func_ov38_02185720
.extern gAdventureFlags
.extern gItemManager
.extern gMapManager
.extern strcpy
asm/ov37.inc
+1 -1
View File
@@ -79,7 +79,6 @@
.extern data_027e0c54
.extern data_027e0d0c
.extern data_027e0e58
.extern gMapManager
.extern data_027e0f64
.extern data_027e0f6c
.extern data_027e0f90
@@ -276,4 +275,5 @@
.extern func_ov17_021687f0
.extern gAdventureFlags
.extern gItemManager
.extern gMapManager
.extern strncpy
asm/ov46.inc
+6 -6
View File
@@ -1,5 +1,8 @@
#pragma once
.extern Approach_thunk
.extern _ZN10MapManager16MapData_vfunc_78Ev
.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i
.extern _ZN11ItemManager10GiveRupeesEjj
.extern _ZN11ItemManager16SetTreasureCountEjc
.extern _ZN12ActorManager15FindActorByTypeEP8ActorRefPS_j
@@ -55,6 +58,8 @@
.extern _ZN5Actor9GetHitboxEP8Cylinder
.extern _ZN5ActorC2Ev
.extern _ZN5ActorD2Ev
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern _ZN9SysObjectdlEPv
.extern _ZN9SysObjectnwEmPjj
.extern _ZNK11ItemManager16GetTreasureCountEj
@@ -69,7 +74,6 @@
.extern data_027e0d38
.extern data_027e0dbc
.extern data_027e0e58
.extern gMapManager
.extern data_027e0f6c
.extern data_027e0f94
.extern data_027e0fc8
@@ -116,16 +120,11 @@
.extern func_02036ce4
.extern func_02036f68
.extern func_02037628
.extern _ZN9ActorTypeC1EjPFP5ActorvEPv
.extern _ZN9ActorTypeD1Ev
.extern func_ov00_02079e68
.extern func_ov00_0207a1c8
.extern func_ov00_0207ba90
.extern func_ov00_0207c1b0
.extern func_ov00_0207c1f8
.extern _ZN10MapManager18func_ov00_02083a1cEiPS_P5Vec3p
.extern _ZN10MapManager18func_ov00_02083fb0EiPS_i
.extern _ZN10MapManager16MapData_vfunc_78Ev
.extern func_ov00_02093a5c
.extern func_ov00_02093af0
.extern func_ov00_02094824
@@ -232,3 +231,4 @@
.extern func_ov34_0217bf5c
.extern gAdventureFlags
.extern gItemManager
.extern gMapManager
include/Player/TouchControl.hpp
+1
View File
@@ -42,4 +42,5 @@ public:
bool func_ov00_0207aeac();
void UpdateConditionally(TouchState *state, u16 speed);
void func_ov00_0207af38(u16 speed, bool param2);
~TouchControl();
};
src/00_Core/Player/TouchControl.cpp
+1
View File
@@ -10,5 +10,6 @@ void TouchControl::Update(TouchState *state, u16 speed) {}
bool TouchControl::func_ov00_0207aeac() {}
void TouchControl::UpdateConditionally(TouchState *state, u16 speed) {}
void TouchControl::func_ov00_0207af38(u16 speed, bool param2) {}
TouchControl::~TouchControl() {}
#endif
tools/lcf.py
+6 -1
View File
@@ -37,7 +37,12 @@ ov00 = Overlay(name='ov00', after='ARM9', objects=[
'src/00_Core/Player/TouchControl.cpp',
'asm/ov00/Player/TouchControl.s',
'asm/ov00/ov00_0207af9c.s',
'asm/ov00/ov00_0207afa0.s',
'asm/ov00/Map/Course.s',
'src/00_Core/Map/Course.cpp',
'asm/ov00/ov00_0207da38.s',
'asm/ov00/Map/MapManager.s',
'src/00_Core/Map/MapManager.cpp',