Merge pull request #38 from AnonymousRandomPerson/main

Synced from pmdsky-debug
pret · Nov 28, 2023 · 79efa09 · 79efa09
2 parents 67f3ab5 + 4c60e86
commit 79efa09
Show file tree

Hide file tree

Showing 27 changed files with 86 additions and 86 deletions.
diff --git a/asm/include/main_02000C6C.inc b/asm/include/main_02000C6C.inc
@@ -203,6 +203,7 @@
 .public PRNG_SEQUENCE_NUM
 .public sprintf
 .public sqrtf
+.public StartThread
 .public StopBgmCommand
 .public strcat
 .public strcmp
@@ -272,7 +273,6 @@
 .public sub_02078A98
 .public sub_02078C68
 .public sub_0207902C
-.public sub_02079560
 .public sub_02079844
 .public sub_02079888
 .public sub_02079940

diff --git a/asm/include/overlay_00.inc b/asm/include/overlay_00.inc
@@ -67,6 +67,7 @@
 .public SetIrqFlag
 .public snprintf
 .public sprintf
+.public StartThread
 .public strcat
 .public strchr
 .public strcmp
@@ -141,8 +142,6 @@
 .public sub_020790DC
 .public sub_0207911C
 .public sub_02079550
-.public sub_02079560
-.public sub_0207965C
 .public sub_0207976C
 .public sub_02079800
 .public sub_02079830
@@ -236,6 +235,7 @@
 .public sub_0208FE3C
 .public sub_020902AC
 .public SVC_WaitByLoop
+.public ThreadExit
 .public UnloadOverlay
 .public WaitForever2
 .public wcslen
diff --git a/asm/include/overlay_02.inc b/asm/include/overlay_02.inc
@@ -102,6 +102,7 @@
 .public ov00_02318160
 .public ov00_023250C8
 .public SetIrqFlag
+.public StartThread
 .public strcpy
 .public strlen
 .public strncpy
@@ -175,7 +176,6 @@
 .public sub_020790DC
 .public sub_0207911C
 .public sub_02079550
-.public sub_02079560
 .public sub_02079800
 .public sub_02079830
 .public sub_02079940

diff --git a/asm/include/overlay_29_022E37DC.inc b/asm/include/overlay_29_022E37DC.inc
@@ -9,6 +9,7 @@
 .public CheckSpawnThreshold
 .public CreateTextBox1
 .public DIRECTIONS_XY
+.public DisplayAnimatedNumbers
 .public DUNGEON_PTR
 .public DungeonFloorToGroupFloor
 .public DungeonGetSpriteIndex
@@ -86,7 +87,6 @@
 .public ov29_022DE5F0
 .public ov29_022E2CA0
 .public ov29_022EA370
-.public ov29_022EA718
 .public ov29_022EACCC
 .public ov29_022EACE4
 .public ov29_022ED0F4

diff --git a/asm/include/overlay_29_022F7388.inc b/asm/include/overlay_29_022F7388.inc
@@ -19,6 +19,7 @@
 .public DeleteWanTableEntryVeneer
 .public DIRECTIONS_XY
 .public DiscoverMinimap
+.public DisplayAnimatedNumbers
 .public DisplayMessage
 .public DisplayMessage2
 .public DrawMinimapTile
@@ -147,7 +148,6 @@
 .public ov29_022E8104
 .public ov29_022E81F8
 .public ov29_022EA370
-.public ov29_022EA718
 .public ov29_022ECDE4
 .public ov29_022EF7C4
 .public ov29_022EF938

diff --git a/asm/include/overlay_29_02308FE0.inc b/asm/include/overlay_29_02308FE0.inc
@@ -37,6 +37,7 @@
 .public DebugRecruitingEnabled
 .public DEF_SCARF_STAT_BOOST
 .public DEFENSIVE_STAT_STAGE_MULTIPLIERS
+.public DisplayAnimatedNumbers
 .public DivideFixedPoint64
 .public DUNGEON_PTR
 .public DungeonRandInt
@@ -161,7 +162,6 @@
 .public ov29_022E81F8
 .public ov29_022E9628
 .public ov29_022EA370
-.public ov29_022EA718
 .public ov29_022EACAC
 .public ov29_022EAF20
 .public ov29_022EAF34

diff --git a/asm/include/overlay_29_0231513C.inc b/asm/include/overlay_29_0231513C.inc
@@ -9,6 +9,7 @@
 .public BoostOffensiveStat
 .public CalcStatusDuration
 .public CeilFixedPoint
+.public DisplayAnimatedNumbers
 .public DUNGEON_PTR
 .public DungeonGetSpriteIndex
 .public DungeonRandInt
@@ -112,7 +113,6 @@
 .public ov29_022E4AF0
 .public ov29_022E4B3C
 .public ov29_022E81F8
-.public ov29_022EA718
 .public ov29_022EACCC
 .public ov29_022FB984
 .public ov29_02304830

diff --git a/asm/include/overlay_29_0231CBEC.inc b/asm/include/overlay_29_0231CBEC.inc
@@ -39,6 +39,8 @@
 .public GINSENG_CHANCE_3
 .public GUMMI_BELLY_RESTORE_TABLE
 .public GUMMI_LIKE_STRING_IDS
+.public HandleMovesMenuWrapper0
+.public HandleMovesMenuWrapper1
 .public HandleSir0Translation
 .public InitMove
 .public IQ_GUMMI_GAIN_TABLE
@@ -110,8 +112,6 @@
 .public ov29_023529AC
 .public ov29_023529B0
 .public ov29_02353324
-.public ov31_023853BC
-.public ov31_023853E0
 .public ov31_02385FE0
 .public ov31_023860A4
 .public ov31_0238619C

diff --git a/asm/include/overlay_29_0232C524.inc b/asm/include/overlay_29_0232C524.inc
@@ -65,7 +65,6 @@
 .public ov29_022E1AAC
 .public ov29_022E1AD4
 .public ov29_022E1EF8
-.public ov29_022E3430
 .public ov29_022E34A8_EU
 .public ov29_022E6770
 .public ov29_022E6784
@@ -102,6 +101,7 @@
 .public RevealEnemies
 .public RevealItems
 .public RevealStairs
+.public RevealWholeFloor
 .public ROOST_HP_RESTORATION_TABLE
 .public SHADOW_FORCE_DAMAGE_MULTIPLIER
 .public SLEEP_TURN_RANGE

diff --git a/asm/include/overlay_29_0232E864.inc b/asm/include/overlay_29_0232E864.inc
@@ -14,6 +14,7 @@
 .public Conversion2IsActive
 .public CreateMainMenus
 .public DIRECTIONS_XY
+.public DisplayAnimatedNumbers
 .public DoMoveAbsorb
 .public DoMoveAcupressure
 .public DoMoveAmnesia
@@ -386,7 +387,6 @@
 .public ov29_022E6388
 .public ov29_022E6424
 .public ov29_022EA370
-.public ov29_022EA718
 .public ov29_022EDC30
 .public ov29_022F9840
 .public ov29_022FB1A8

diff --git a/asm/include/overlay_29_0234DDF4.inc b/asm/include/overlay_29_0234DDF4.inc
@@ -13,6 +13,7 @@
 .public GetLeaderAction
 .public GetLeaderMonster
 .public GetTile
+.public HandleMovesMenuWrapper0
 .public HideTileGrid
 .public InitMove
 .public LoadOverlay
@@ -45,7 +46,6 @@
 .public ov31_02382E18
 .public ov31_0238367C
 .public ov31_023838E4
-.public ov31_023853BC
 .public ov31_02385FE0
 .public ov31_023860A4
 .public ov31_0238619C

diff --git a/asm/main_02000C6C.s b/asm/main_02000C6C.s
@@ -2199,7 +2199,7 @@ sub_02002778: ; 0x02002778
 	ldmia ip, {r1, lr}
 	ldr r0, [r4]
 	add r3, lr, r3
-	bl sub_02079560
+	bl StartThread
 	mov r0, r4
 	bl sub_020026E4
 	add sp, sp, #8