Decompile field/overlay_01_021E66E4.c

pret · Apr 22, 2024 · e0704a2 · e0704a2
1 parent 86e5118
commit e0704a2
Show file tree

Hide file tree

Showing 15 changed files with 368 additions and 517 deletions.
diff --git a/asm/include/overlay_01_021E5900.inc b/asm/include/overlay_01_021E5900.inc
@@ -117,9 +117,9 @@
 .public ov01_021E631C
 .public ov01_021E6340
 .public ov01_021E636C
-.public ov01_021E66E4
-.public ov01_021E6734
-.public ov01_021E6768
+.public Field3dObjectTaskManager_Create
+.public Field3dObjectTaskManager_Delete
+.public Field3dObjectTaskManager_RunDrawTasks
 .public ov01_021E7F00
 .public ov01_021E87E4
 .public ov01_021E8A28

diff --git a/asm/include/overlay_01_021E66E4.inc b/asm/include/overlay_01_021E66E4.inc
@@ -11,9 +11,9 @@
 .public GF_AssertFail
 .public sub_0203DF8C
 .public MIi_CpuClear32
-.public ov01_021E66E4
-.public ov01_021E6734
-.public ov01_021E6768
-.public ov01_021E67BC
-.public ov01_021E683C
-.public ov01_021E687C
+.public Field3dObjectTaskManager_Create
+.public Field3dObjectTaskManager_Delete
+.public Field3dObjectTaskManager_RunDrawTasks
+.public Field3dObjectTaskManager_CreateTask
+.public Field3dObjectTask_Delete
+.public Field3dObjectTask_GetData
diff --git a/asm/include/overlay_01_021FC05C.inc b/asm/include/overlay_01_021FC05C.inc
@@ -21,9 +21,9 @@
 .public G2x_SetBlendAlpha_
 .public memset
 .public _s32_div_f
-.public ov01_021E67BC
-.public ov01_021E683C
-.public ov01_021E687C
+.public Field3dObjectTaskManager_CreateTask
+.public Field3dObjectTask_Delete
+.public Field3dObjectTask_GetData
 .public ov01_021EB31C
 .public GetHoneySweetScentWorkSize
 .public Task_HoneyOrSweetScent

diff --git a/asm/include/overlay_02.inc b/asm/include/overlay_02.inc
@@ -378,9 +378,9 @@
 .public gGameVersion
 .public FX_SinCosTable_
 .public gSystem
-.public ov01_021E67BC
-.public ov01_021E683C
-.public ov01_021E687C
+.public Field3dObjectTaskManager_CreateTask
+.public Field3dObjectTask_Delete
+.public Field3dObjectTask_GetData
 .public ov01_021E8970
 .public ov01_021E8A8C
 .public ov01_021E8B04
@@ -510,7 +510,7 @@
 .public ov02_022507B4
 .public ov02_022508B4
 .public ov02_02250A60
-.public ov02_02250AC8
+.public LegendCutscene_EndKimonoDance
 .public ov02_02250AE8
 .public ov02_02250AFC
 .public ov02_02250B30

diff --git a/asm/overlay_01_021E5900.s b/asm/overlay_01_021E5900.s
@@ -158,7 +158,7 @@ _021E5A12:
 	add r0, r4, #0
 	mov r1, #4
 	mov r2, #8
-	bl ov01_021E66E4
+	bl Field3dObjectTaskManager_Create
 	ldr r1, [r4, #4]
 	str r0, [r1, #4]
 	ldr r1, _021E5BCC ; =0x00000D69
@@ -583,7 +583,7 @@ _021E5E12:
 	bl GF3dRender_DeleteSimpleManager
 	ldr r0, [r4, #4]
 	ldr r0, [r0, #4]
-	bl ov01_021E6734
+	bl Field3dObjectTaskManager_Delete
 	mov r0, #0
 	add r1, r0, #0
 	bl Main_SetVBlankIntrCB
@@ -1166,7 +1166,7 @@ _021E6294:
 	bl NNS_G3dGlbFlushP
 	ldr r0, [r4, #4]
 	ldr r0, [r0, #4]
-	bl ov01_021E6768
+	bl Field3dObjectTaskManager_RunDrawTasks
 	ldr r1, _021E6318 ; =gG3dDepthBufferingMode
 	add r0, r5, #0
 	ldr r1, [r1]

diff --git a/asm/overlay_01_021E66E4.s b/asm/overlay_01_021E66E4.s
diff --git a/asm/overlay_01_021FC05C.s b/asm/overlay_01_021FC05C.s
@@ -118,27 +118,27 @@ ov01_021FC10C: ; 0x021FC10C
 	thumb_func_start ov01_021FC110
 ov01_021FC110: ; 0x021FC110
 	ldr r0, [r0, #4]
-	ldr r3, _021FC11C ; =ov01_021E67BC
+	ldr r3, _021FC11C ; =Field3dObjectTaskManager_CreateTask
 	ldr r0, [r0, #4]
 	ldr r1, _021FC120 ; =ov01_02208BCC
 	bx r3
 	nop
-_021FC11C: .word ov01_021E67BC
+_021FC11C: .word Field3dObjectTaskManager_CreateTask
 _021FC120: .word ov01_02208BCC
 	thumb_func_end ov01_021FC110
 
 	thumb_func_start ov01_021FC124
 ov01_021FC124: ; 0x021FC124
-	ldr r3, _021FC128 ; =ov01_021E683C
+	ldr r3, _021FC128 ; =Field3dObjectTask_Delete
 	bx r3
 	.balign 4, 0
-_021FC128: .word ov01_021E683C
+_021FC128: .word Field3dObjectTask_Delete
 	thumb_func_end ov01_021FC124
 
 	thumb_func_start ov01_021FC12C
 ov01_021FC12C: ; 0x021FC12C
 	push {r3, lr}
-	bl ov01_021E687C
+	bl Field3dObjectTask_GetData
 	ldr r0, [r0, #0x14]
 	pop {r3, pc}
 	.balign 4, 0
@@ -147,12 +147,12 @@ ov01_021FC12C: ; 0x021FC12C
 	thumb_func_start ov01_021FC138
 ov01_021FC138: ; 0x021FC138
 	ldr r0, [r0, #4]
-	ldr r3, _021FC144 ; =ov01_021E67BC
+	ldr r3, _021FC144 ; =Field3dObjectTaskManager_CreateTask
 	ldr r0, [r0, #4]
 	ldr r1, _021FC148 ; =ov01_02208BE4
 	bx r3
 	nop
-_021FC144: .word ov01_021E67BC
+_021FC144: .word Field3dObjectTaskManager_CreateTask
 _021FC148: .word ov01_02208BE4
 	thumb_func_end ov01_021FC138