Merge pull request #353 from adrienntindall/overlay_02_02251E74

Decompile overlay_02_02251E74.c
pret · Nov 23, 2024 · 60aebbc · 60aebbc
2 parents 463c9e8 + 37f0167
commit 60aebbc
Show file tree

Hide file tree

Showing 47 changed files with 3,244 additions and 5,103 deletions.
diff --git a/.clang-format b/.clang-format
@@ -9,7 +9,7 @@ AlignConsecutiveAssignments: None
 AlignConsecutiveBitFields: None
 AlignConsecutiveDeclarations: None
 AlignConsecutiveMacros: Consecutive
-AlignEscapedNewlines: LeftWithLastLine
+AlignEscapedNewlines: Left
 AlignTrailingComments: true
 AlignArrayOfStructures: Left
 

diff --git a/asm/include/overlay_01_021E6880.inc b/asm/include/overlay_01_021E6880.inc
@@ -158,11 +158,11 @@
 .public ov01_021E5924
 .public ov01_021E5BE4
 .public ov01_021E5C24
-.public ov01_021E6928
-.public ov01_021E6AF4
-.public ov01_021E6E00
-.public ov01_021E6EFC
-.public ov01_021E6FD4
+.public FieldInput_Update
+.public FieldInput_Process
+.public FieldInput_Process_Colosseum
+.public FieldInput_Process_UnionRoom
+.public FieldInput_Process_BattleTower
 .public ov01_021E7F00
 .public ov01_021E7F54
 .public FieldSystem_FacingModelIsHeadbuttTree

diff --git a/asm/include/overlay_02.inc b/asm/include/overlay_02.inc
@@ -531,9 +531,9 @@
 .public GetRadioMusicPlayingSeq
 .public ov02_02252334
 .public ov02_022523B4
-.public ov02_02252534
-.public ov02_022529FC
-.public ov02_02252EE4
+.public FieldSystem_BeginCelebiTimeTravelCutsceneTask
+.public FieldSystem_BeginSinjohCutsceneTask
+.public FieldSystem_BeginSinjohGetEggCutsceneTask
 .public ov02_02253134
 .public ov02_0225316C
 .public ov02_02253188

diff --git a/asm/include/overlay_27.inc b/asm/include/overlay_27.inc
@@ -96,7 +96,7 @@
 .public FieldSystem_ShouldDrawStartMenuIcon
 .public FieldSystem_GetFacingObject
 .public sub_0203DF8C
-.public sub_0203E13C
+.public FieldSystem_IsPlayerMovementAllowed
 .public MapSceneScriptCheck
 .public Save_VarsFlags_Get
 .public FieldSystem_TaskIsRunning

diff --git a/asm/include/overlay_28.inc b/asm/include/overlay_28.inc
@@ -68,7 +68,7 @@
 .public String_Delete
 .public FieldSystem_GetFacingObject
 .public sub_0203DF8C
-.public sub_0203E13C
+.public FieldSystem_IsPlayerMovementAllowed
 .public AllocAndFetchNearbyHiddenItems
 .public FieldSystem_TaskIsRunning
 .public PlayerAvatar_GetMapObject

diff --git a/asm/include/unk_0205CB48.inc b/asm/include/unk_0205CB48.inc
@@ -61,9 +61,9 @@
 .public sub_0205CB00
 .public sub_0205CB14
 .public sub_0205CB2C
-.public sub_0205CB48
+.public PlayerAvatar_MoveControl
 .public sub_0205CBE4
-.public sub_0205CE68
+.public PlayerAvatar_UpdateMovement
 .public sub_0205CF44
 .public sub_0205CF60
 .public sub_0205CFBC

diff --git a/asm/overlay_01_021E6880.s b/asm/overlay_01_021E6880.s
@@ -105,8 +105,8 @@ ov01_021E6920: ; 0x021E6920
 _021E6924: .word ov01_021F6B64
 	thumb_func_end ov01_021E6920
 
-	thumb_func_start ov01_021E6928
-ov01_021E6928: ; 0x021E6928
+	thumb_func_start FieldInput_Update
+FieldInput_Update: ; 0x021E6928
 	push {r3, r4, r5, r6, r7, lr}
 	sub sp, #0x10
 	add r4, r1, #0
@@ -347,10 +347,10 @@ _021E6AE4:
 	strb r0, [r5, #4]
 	add sp, #0x10
 	pop {r3, r4, r5, r6, r7, pc}
-	thumb_func_end ov01_021E6928
+	thumb_func_end FieldInput_Update
 
-	thumb_func_start ov01_021E6AF4
-ov01_021E6AF4: ; 0x021E6AF4
+	thumb_func_start FieldInput_Process
+FieldInput_Process: ; 0x021E6AF4
 	push {r3, r4, r5, r6, r7, lr}
 	add r5, r0, #0
 	ldrh r0, [r5]
@@ -680,7 +680,7 @@ _021E6DB6:
 	nop
 _021E6DBC: .word 0x0000FFFF
 _021E6DC0: .word SEQ_SE_DP_WIN_OPEN
-	thumb_func_end ov01_021E6AF4
+	thumb_func_end FieldInput_Process
 
 	thumb_func_start ov01_021E6DC4
 ov01_021E6DC4: ; 0x021E6DC4
@@ -712,8 +712,8 @@ _021E6DF6:
 _021E6DFC: .word 0x0000FFFF
 	thumb_func_end ov01_021E6DC4
 
-	thumb_func_start ov01_021E6E00
-ov01_021E6E00: ; 0x021E6E00
+	thumb_func_start FieldInput_Process_Colosseum
+FieldInput_Process_Colosseum: ; 0x021E6E00
 	push {r3, r4, r5, lr}
 	add r4, r0, #0
 	ldrh r0, [r4]
@@ -810,7 +810,7 @@ _021E6ECA:
 	nop
 _021E6ED0: .word std_colosseum_exit
 _021E6ED4: .word SEQ_SE_DP_WIN_OPEN
-	thumb_func_end ov01_021E6E00
+	thumb_func_end FieldInput_Process_Colosseum
 
 	thumb_func_start ov01_021E6ED8
 ov01_021E6ED8: ; 0x021E6ED8
@@ -836,8 +836,8 @@ _021E6EF8:
 	pop {r3, r4, r5, pc}
 	thumb_func_end ov01_021E6ED8
 
-	thumb_func_start ov01_021E6EFC
-ov01_021E6EFC: ; 0x021E6EFC
+	thumb_func_start FieldInput_Process_UnionRoom
+FieldInput_Process_UnionRoom: ; 0x021E6EFC
 	push {r3, r4, r5, lr}
 	add r4, r0, #0
 	add r5, r1, #0
@@ -932,10 +932,10 @@ _021E6FCC:
 	pop {r3, r4, r5, pc}
 	.balign 4, 0
 _021E6FD0: .word SEQ_SE_DP_WIN_OPEN
-	thumb_func_end ov01_021E6EFC
+	thumb_func_end FieldInput_Process_UnionRoom
 
-	thumb_func_start ov01_021E6FD4
-ov01_021E6FD4: ; 0x021E6FD4
+	thumb_func_start FieldInput_Process_BattleTower
+FieldInput_Process_BattleTower: ; 0x021E6FD4
 	push {r3, r4, r5, r6, lr}
 	sub sp, #4
 	add r5, r0, #0
@@ -1084,7 +1084,7 @@ _021E7106:
 	.balign 4, 0
 _021E710C: .word 0x0000FFFF
 _021E7110: .word SEQ_SE_DP_WIN_OPEN
-	thumb_func_end ov01_021E6FD4
+	thumb_func_end FieldInput_Process_BattleTower
 
 	thumb_func_start ov01_021E7114
 ov01_021E7114: ; 0x021E7114