Skip to content

Commit b972bfe

Browse files
committed
Moved all assembly functions into assembly.cpp
1 parent f1758b1 commit b972bfe

19 files changed

+421
-357
lines changed

ttyd-tools/rel/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ else
4141
#---------------------------------------------------------------------------------
4242
TARGET := $(notdir $(CURDIR)).$(VERSION)
4343
BUILD := build.$(VERSION)
44-
SOURCES := source $(wildcard source/*)
44+
SOURCES := source
4545
DATA := data
4646
INCLUDES := include
4747

ttyd-tools/rel/include/assembly.h

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,19 @@ namespace mod {
77
extern "C" {
88

99
// Assembly overwrite functions
10-
// main.cpp
11-
void StartReplaceJumpFallAnim();
12-
void StartAllowRunningFromBattles();
13-
void StartForceNPCItemDrop();
14-
void StartDisplayMegaJumpBadgeBattleMenu();
15-
void StartDisplayMegaHammerBadgesBattleMenu();
16-
void StartFixBlooperCrash1();
17-
void StartFixBlooperCrash2();
18-
void StartPreventTextboxSelection();
19-
void StartDisableDPadOptionsDisplay();
20-
void StartFixEvtMapBlendSetFlagPartnerCrash();
21-
void StartFixEvtMapBlendSetFlagFollowerCrash();
22-
void StartFallThroughMostObjectsStandard();
23-
void StartFallThroughMostObjectsBowser();
10+
void asmReplaceJumpFallAnim();
11+
void asmAllowRunningFromBattles();
12+
void asmForceNPCItemDrop();
13+
void asmDisplayMegaJumpBadgeBattleMenu();
14+
void asmDisplayMegaHammerBadgesBattleMenu();
15+
void asmFixBlooperCrash1();
16+
void asmFixBlooperCrash2();
17+
void asmPreventTextboxSelection();
18+
void asmDisableDPadOptionsDisplay();
19+
void asmFixEvtMapBlendSetFlagPartnerCrash();
20+
void asmFixEvtMapBlendSetFlagFollowerCrash();
21+
void asmFallThroughMostObjectsStandard();
22+
void asmFallThroughMostObjectsBowser();
2423

2524
// Functions accessed by assembly overwrites
2625
// main.cpp

0 commit comments

Comments
 (0)