Merge pull request #46 from AnonymousRandomPerson/main

Synced from pmdsky-debug
pret · Dec 21, 2023 · 9327eef · 9327eef
2 parents 11e63cc + c05f253
commit 9327eef
Show file tree

Hide file tree

Showing 37 changed files with 133 additions and 133 deletions.
diff --git a/asm/include/itcm.inc b/asm/include/itcm.inc
@@ -166,7 +166,6 @@
 .public sub_0201BD50
 .public sub_0201BD80
 .public sub_0202760C
-.public sub_02027AF0
 .public sub_0207A238
 .public sub_0207A244
 .public sub_0207A300
@@ -178,3 +177,4 @@
 .public TRIG_TABLE
 .public TryAddTargetToAiTargetList
 .public UpdateAiTargetPos
+.public UpdateWindow
diff --git a/asm/include/main_02054C24.inc b/asm/include/main_02054C24.inc
@@ -494,7 +494,6 @@
 .public sub_020264F8
 .public sub_02026E78
 .public sub_02027180
-.public sub_02027AF0
 .public sub_0202836C
 .public sub_02029F88
 .public sub_02029FBC
@@ -614,6 +613,7 @@
 .public UnloadFile
 .public UnloadOverlay
 .public UpdateTrackVolumeEnvelopes
+.public UpdateWindow
 .public vsprintf
 .public WAN_TABLE
 .public ZINC_BAND_STAT_BOOST

diff --git a/asm/include/overlay_01.inc b/asm/include/overlay_01.inc
@@ -277,7 +277,6 @@
 .public sub_02026268
 .public sub_0202676C
 .public sub_0202737C
-.public sub_02027AF0
 .public sub_02027B1C
 .public sub_020288FC
 .public sub_02029F88
@@ -372,5 +371,6 @@
 .public sub_020851AC
 .public sub_0208FE3C
 .public sub_0208FE48
+.public UpdateWindow
 .public vsprintf
 .public WAN_TABLE
diff --git a/asm/include/overlay_05.inc b/asm/include/overlay_05.inc
@@ -74,7 +74,6 @@
 .public sub_02003BC8
 .public sub_02003BFC
 .public sub_02006C8C
-.public sub_02027AF0
 .public sub_0202836C
 .public sub_02029F88
 .public sub_02029FBC
@@ -108,3 +107,4 @@
 .public sub_02062B64
 .public sub_0208FE3C
 .public sub_0208FE48
+.public UpdateWindow
diff --git a/asm/include/overlay_07.inc b/asm/include/overlay_07.inc
@@ -115,7 +115,6 @@
 .public sub_02003BFC
 .public sub_0202065C
 .public sub_020264F8
-.public sub_02027AF0
 .public sub_02027B1C
 .public sub_0202836C
 .public sub_02029F88
@@ -149,3 +148,4 @@
 .public sub_0205BD78
 .public sub_0208FE3C
 .public sub_0208FE48
+.public UpdateWindow
diff --git a/asm/include/overlay_09.inc b/asm/include/overlay_09.inc
@@ -41,7 +41,6 @@
 .public sub_02017B7C
 .public sub_020263C8
 .public sub_020265A8
-.public sub_02027AF0
 .public sub_02027B1C
 .public sub_0202810C
 .public sub_0202812C
@@ -66,3 +65,4 @@
 .public sub_02033758
 .public sub_0204CA1C
 .public sub_02052060
+.public UpdateWindow
diff --git a/asm/include/overlay_10.inc b/asm/include/overlay_10.inc
@@ -262,7 +262,6 @@
 .public sub_02025010_EU
 .public sub_020263C8
 .public sub_020265A8
-.public sub_02027AF0
 .public sub_02027B1C
 .public sub_0202810C
 .public sub_0202812C
@@ -341,5 +340,6 @@
 .public UnloadFile
 .public UnloadOverlay
 .public UnloadWte
+.public UpdateWindow
 .public vsprintf
 .public WAN_TABLE
diff --git a/asm/include/overlay_11.inc b/asm/include/overlay_11.inc
@@ -520,7 +520,6 @@
 .public sub_02026268
 .public sub_020262E0
 .public sub_020265A8
-.public sub_02027AF0
 .public sub_02027B1C
 .public sub_0202810C
 .public sub_0202812C
@@ -809,6 +808,7 @@
 .public UnloadFile
 .public UnloadOverlay
 .public UpdateTeamStats
+.public UpdateWindow
 .public vsprintf
 .public WAN_TABLE
 .public ZInit8

diff --git a/asm/include/overlay_13.inc b/asm/include/overlay_13.inc
@@ -60,7 +60,6 @@
 .public sub_02017C74
 .public sub_02017CB4
 .public sub_0201F2E4
-.public sub_02027AF0
 .public sub_02027B1C
 .public sub_0202836C
 .public sub_02028770
@@ -73,3 +72,4 @@
 .public sub_02048764
 .public sub_02048794
 .public sub_0204A198
+.public UpdateWindow
diff --git a/asm/include/overlay_14.inc b/asm/include/overlay_14.inc
@@ -64,8 +64,8 @@
 .public sub_02017B70
 .public sub_02017B7C
 .public sub_02017C80
-.public sub_02027AF0
 .public sub_0202BC60
 .public sub_0202F334
 .public sub_0202F954
 .public sub_0204AE60
+.public UpdateWindow
diff --git a/asm/include/overlay_15.inc b/asm/include/overlay_15.inc
@@ -35,7 +35,6 @@
 .public ShowStringIdInDialogueBox
 .public sub_02017C80
 .public sub_02026268
-.public sub_02027AF0
 .public sub_02027B1C
 .public sub_0202836C
 .public sub_020288DC
@@ -44,3 +43,4 @@
 .public sub_020395CC
 .public sub_020396E4
 .public sub_02039B0C
+.public UpdateWindow
diff --git a/asm/include/overlay_18.inc b/asm/include/overlay_18.inc
@@ -51,7 +51,6 @@
 .public sub_02017C74
 .public sub_02017C80
 .public sub_02026268
-.public sub_02027AF0
 .public sub_02027B1C
 .public sub_0202BBF0
 .public sub_0202BC60
@@ -112,4 +111,5 @@
 .public sub_020573A0
 .public sub_0205B028
 .public TEAM_MEMBER_TABLE_PTR
+.public UpdateWindow
 .public vsprintf
diff --git a/asm/include/overlay_20.inc b/asm/include/overlay_20.inc
@@ -77,7 +77,6 @@
 .public sub_02017C10
 .public sub_02017C50
 .public sub_02025D50
-.public sub_02027AF0
 .public sub_02027B1C
 .public sub_0202A03C
 .public sub_0202B490
@@ -97,3 +96,4 @@
 .public sub_02046C30
 .public sub_02046C78
 .public sub_02046D20
+.public UpdateWindow
diff --git a/asm/include/overlay_21.inc b/asm/include/overlay_21.inc
@@ -72,7 +72,6 @@
 .public sub_02017C74
 .public sub_02017C80
 .public sub_02026268
-.public sub_02027AF0
 .public sub_02027B1C
 .public sub_0202836C
 .public sub_0202F2C4
@@ -101,3 +100,4 @@
 .public sub_020420F4
 .public sub_020572EC
 .public sub_0205B028
+.public UpdateWindow
diff --git a/asm/include/overlay_25.inc b/asm/include/overlay_25.inc
@@ -49,7 +49,7 @@
 .public sub_02017C74
 .public sub_02017C80
 .public sub_02026268
-.public sub_02027AF0
 .public sub_02027B1C
 .public sub_0202836C
 .public sub_0202F2C4
+.public UpdateWindow
diff --git a/asm/include/overlay_29_022E37DC.inc b/asm/include/overlay_29_022E37DC.inc
@@ -163,7 +163,6 @@
 .public sub_0201C000
 .public sub_0201CF90
 .public sub_0201D034
-.public sub_02027AF0
 .public sub_02048384
 .public sub_020483B8
 .public sub_020483D8
@@ -174,3 +173,4 @@
 .public TOP_SCREEN_STATUS_PTR
 .public UnloadFile
 .public UpdateMinimap
+.public UpdateWindow
diff --git a/asm/include/overlay_29_022F05B4.inc b/asm/include/overlay_29_022F05B4.inc
@@ -186,7 +186,6 @@
 .public sub_0201B9F8
 .public sub_0201CF90
 .public sub_02026268
-.public sub_02027AF0
 .public sub_02027B1C
 .public sub_0204AEA0
 .public sub_0204AEB0
@@ -203,4 +202,5 @@
 .public UpdateAiTargetPos
 .public UpdateMinimap
 .public UpdateTrapsVisibility
+.public UpdateWindow
 .public YesNoMenu
diff --git a/asm/include/overlay_31.inc b/asm/include/overlay_31.inc
@@ -187,7 +187,6 @@
 .public sub_02017C80
 .public sub_02025888
 .public sub_020265A8
-.public sub_02027AF0
 .public sub_02027B1C
 .public sub_0202810C
 .public sub_0202812C
@@ -244,5 +243,6 @@
 .public sub_020585B4
 .public TryPointCameraToMonster
 .public UpdateMapSurveyorFlag
+.public UpdateWindow
 .public vsprintf
 .public YesNoMenu
diff --git a/asm/itcm.s b/asm/itcm.s
@@ -1329,7 +1329,7 @@ _01FF9274:
 	ldrb r1, [r1, #6]
 	cmp r6, r1
 	blt _01FF9170
-	bl sub_02027AF0
+	bl UpdateWindow
 _01FF9288:
 	add sp, sp, #0x14
 	ldmia sp!, {r4, r5, r6, r7, r8, sb, sl, fp, pc}
@@ -1441,7 +1441,7 @@ _01FF940C:
 	ldrb r1, [r1, #6]
 	cmp r6, r1
 	blt _01FF92EC
-	bl sub_02027AF0
+	bl UpdateWindow
 _01FF9420:
 	add sp, sp, #0x20
 	ldmia sp!, {r3, r4, r5, r6, r7, r8, sb, sl, fp, pc}