Merge pull request #544 from red031000/master

start decompiling blackout.c
pret · Dec 19, 2023 · 39cc838 · 39cc838
2 parents 7da4ece + 3e12acd
commit 39cc838
Show file tree

Hide file tree

Showing 123 changed files with 1,420 additions and 1,603 deletions.
diff --git a/arm9/arm9.lsf b/arm9/arm9.lsf
@@ -70,7 +70,7 @@ Static arm9
 	Object unk_0201CC08.o
 	Object unk_0201D040.o
 	Object unk_0201E00C.o
-	Object GX_layers.o
+	Object gf_gfx_planes.o
 	Object camera.o
 	Object unk_0201F06C.o
 	Object unk_020208B8.o
@@ -187,7 +187,7 @@ Static arm9
 	Object encounter.o
 	Object unk_02047500.o
 	Object unk_020476CC.o
-	Object unk_02048120.o
+	Object blackout.o
 	Object unk_020484A8.o
 	Object unk_02048904.o
 	Object script_pokemon_util.o

diff --git a/arm9/asm/scrcmd_7.s b/arm9/asm/scrcmd_7.s
@@ -503,7 +503,7 @@ ScrCmd_Unk00EA: ; 0x02041AB4
 ScrCmd_Unk00EB: ; 0x02041AD4
 	push {r3, lr}
 	ldr r0, [r0, #0x74]
-	bl CallFieldTask_BlackOut
+	bl CallTask_Blackout
 	mov r0, #0x1
 	pop {r3, pc}
 

diff --git a/arm9/asm/unk_0201B1A8.s b/arm9/asm/unk_0201B1A8.s
@@ -199,7 +199,7 @@ sub_0201B314: ; 0x0201B314
 	push {r3, lr}
 	mov r0, #0x1
 	add r1, r0, #0x0
-	bl GX_EngineAToggleLayers
+	bl GfGfx_EngineATogglePlanes
 	ldr r0, _0201B380 ; =0x04000008
 	mov r1, #0x3
 	ldrh r2, [r0, #0x0]

diff --git a/arm9/asm/unk_02022318.s b/arm9/asm/unk_02022318.s
@@ -99,7 +99,7 @@ sub_020223D4: ; 0x020223D4
 	push {r3, lr}
 	mov r0, #0x1
 	add r1, r0, #0x0
-	bl GX_EngineAToggleLayers
+	bl GfGfx_EngineATogglePlanes
 	ldr r0, _02022438 ; =0x04000008
 	mov r1, #0x3
 	ldrh r2, [r0, #0x0]

diff --git a/arm9/asm/unk_02034D7C.s b/arm9/asm/unk_02034D7C.s
@@ -39,7 +39,7 @@ sub_02034D98: ; 0x02034D98
 	add r0, r4, #0x0
 	add r0, #0x8c
 	bl sub_02055468
-	bl sub_02034E8C
+	bl GetMomSpawnId
 	add r4, #0x68
 	strh r0, [r4, #0x0]
 	pop {r4, pc}
@@ -102,8 +102,8 @@ LocalFieldData_SetWeatherType: ; 0x02034DF4
 	bx lr
 	.balign 4
 
-	thumb_func_start sub_02034DFC
-sub_02034DFC: ; 0x02034DFC
+	thumb_func_start LocalFieldData_GetBlackoutSpawn
+LocalFieldData_GetBlackoutSpawn: ; 0x02034DFC
 	add r0, #0x68
 	ldrh r0, [r0, #0x0]
 	bx lr

diff --git a/arm9/asm/unk_02034E84.s b/arm9/asm/unk_02034E84.s
@@ -81,13 +81,13 @@ _02034E88:
 	sub r0, r0, #0x1
 	pop {r3, pc}
 
-	thumb_func_start sub_02034E8C
-sub_02034E8C: ; 0x02034E8C
+	thumb_func_start GetMomSpawnId
+GetMomSpawnId: ; 0x02034E8C
 	mov r0, #0x1
 	bx lr
 
-	thumb_func_start sub_02034E90
-sub_02034E90: ; 0x02034E90
+	thumb_func_start GetSpecialSpawnWarpData
+GetSpecialSpawnWarpData: ; 0x02034E90
 	push {r4, lr}
 	add r4, r1, #0x0
 	bl sub_02034E78
@@ -112,8 +112,8 @@ _02034EB8: .word UNK_020F2224 + 6
 _02034EBC: .word UNK_020F2224 + 8
 _02034EC0: .word UNK_020F2224 + 10
 
-	thumb_func_start sub_02034EC4
-sub_02034EC4: ; 0x02034EC4
+	thumb_func_start GetDeathWarpData
+GetDeathWarpData: ; 0x02034EC4
 	push {r4, lr}
 	add r4, r1, #0x0
 	bl sub_02034E78

diff --git a/arm9/asm/unk_02035068.s b/arm9/asm/unk_02035068.s
@@ -1406,7 +1406,7 @@ _02035B2C:
 	str r2, [r0, r1]
 	mov r0, #0x10
 	mov r1, #0x1
-	bl GX_EngineAToggleLayers
+	bl GfGfx_EngineATogglePlanes
 	add sp, #0xb4
 	pop {r4-r7, pc}
 	.balign 4

diff --git a/arm9/asm/unk_02038C78.s b/arm9/asm/unk_02038C78.s
@@ -480,7 +480,7 @@ gScriptCmdTable: ; 0x020F355C
 	.word ScrCmd_SpecialMart
 	.word ScrCmd_GoodsMart
 	.word ScrCmd_SealsMart
-	.word ScrCmd_DummyBlackOut
+	.word ScrCmd_DummyBlackout
 	.word ScrCmd_SetSpawn
 	.word ScrCmd_GetPlayerGender
 	.word ScrCmd_HealParty