Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Synced from pmdsky-debug #38

Merged
merged 1 commit into from
Nov 28, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion asm/include/main_02000C6C.inc
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@
.public PRNG_SEQUENCE_NUM
.public sprintf
.public sqrtf
.public StartThread
.public StopBgmCommand
.public strcat
.public strcmp
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions asm/include/overlay_00.inc
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@
.public SetIrqFlag
.public snprintf
.public sprintf
.public StartThread
.public strcat
.public strchr
.public strcmp
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -236,6 +235,7 @@
.public sub_0208FE3C
.public sub_020902AC
.public SVC_WaitByLoop
.public ThreadExit
.public UnloadOverlay
.public WaitForever2
.public wcslen
2 changes: 1 addition & 1 deletion asm/include/overlay_02.inc
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@
.public ov00_02318160
.public ov00_023250C8
.public SetIrqFlag
.public StartThread
.public strcpy
.public strlen
.public strncpy
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_29_022E37DC.inc
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
.public CheckSpawnThreshold
.public CreateTextBox1
.public DIRECTIONS_XY
.public DisplayAnimatedNumbers
.public DUNGEON_PTR
.public DungeonFloorToGroupFloor
.public DungeonGetSpriteIndex
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_29_022F7388.inc
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
.public DeleteWanTableEntryVeneer
.public DIRECTIONS_XY
.public DiscoverMinimap
.public DisplayAnimatedNumbers
.public DisplayMessage
.public DisplayMessage2
.public DrawMinimapTile
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_29_02308FE0.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_29_0231513C.inc
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
.public BoostOffensiveStat
.public CalcStatusDuration
.public CeilFixedPoint
.public DisplayAnimatedNumbers
.public DUNGEON_PTR
.public DungeonGetSpriteIndex
.public DungeonRandInt
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions asm/include/overlay_29_0231CBEC.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_29_0232C524.inc
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_29_0232E864.inc
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
.public Conversion2IsActive
.public CreateMainMenus
.public DIRECTIONS_XY
.public DisplayAnimatedNumbers
.public DoMoveAbsorb
.public DoMoveAcupressure
.public DoMoveAmnesia
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion asm/include/overlay_29_0234DDF4.inc
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
.public GetLeaderAction
.public GetLeaderMonster
.public GetTile
.public HandleMovesMenuWrapper0
.public HideTileGrid
.public InitMove
.public LoadOverlay
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion asm/main_02000C6C.s
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading