Merge pull request #361 from tgsm/field/draw-map-name

Decompile overlay_01_021EF7A0 -> field/draw_map_name
pret · Dec 26, 2024 · b5aef45 · b5aef45
2 parents e4918da + 80efa0a
commit b5aef45
Show file tree

Hide file tree

Showing 15 changed files with 251 additions and 557 deletions.
diff --git a/asm/include/overlay_01_021E5900.inc b/asm/include/overlay_01_021E5900.inc
@@ -154,9 +154,9 @@
 .public ov01_021EB234
 .public ov01_021EB260
 .public FieldWeatherUpdate_UsedFlash
-.public ov01_021EF9E0
-.public ov01_021EFA1C
-.public ov01_021EFAF8
+.public FieldDrawMapNameInfo_Create
+.public FieldDrawMapNameInfo_Destroy
+.public FieldSystem_DrawMapNameAnimation
 .public ov01_021F1348
 .public ov01_021F1384
 .public ov01_021F1390

diff --git a/asm/include/overlay_01_021EF7A0.inc b/asm/include/overlay_01_021EF7A0.inc
diff --git a/asm/include/unk_02055244.inc b/asm/include/unk_02055244.inc
@@ -16,4 +16,4 @@
 .public CallTask_FadeFromBlack
 .public sub_020553B0
 .public sub_02055408
-.public ov01_021EFAF8
+.public FieldSystem_DrawMapNameAnimation
diff --git a/asm/overlay_01_021E5900.s b/asm/overlay_01_021E5900.s
@@ -540,7 +540,7 @@ _021E5D82:
 	bl ov01_021F3D50
 	ldr r0, [r4, #4]
 	ldr r0, [r0, #8]
-	bl ov01_021EFA1C
+	bl FieldDrawMapNameInfo_Destroy
 	ldr r0, [r4, #4]
 	ldr r0, [r0, #0xc]
 	bl ov01_021EB234
@@ -750,7 +750,7 @@ _021E5F3E:
 	cmp r6, r0
 	beq _021E5FB8
 	add r0, r5, #0
-	bl ov01_021EFAF8
+	bl FieldSystem_DrawMapNameAnimation
 _021E5FB8:
 	mov r0, #1
 	add sp, #8
@@ -1525,7 +1525,7 @@ _021E65D8:
 	ldr r1, [r4, #4]
 	str r0, [r1, #0xc]
 	ldr r0, [r4, #8]
-	bl ov01_021EF9E0
+	bl FieldDrawMapNameInfo_Create
 	ldr r1, [r4, #4]
 	str r0, [r1, #8]
 	mov r0, #4