Skip to content

Commit ec0baae

Browse files
committed
Revert "Moved all assembly functions into assembly.cpp"
There are several issues with using asm code like this, so the changes should be reverted.
1 parent b972bfe commit ec0baae

19 files changed

+357
-421
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
44+
SOURCES := source $(wildcard source/*)
4545
DATA := data
4646
INCLUDES := include
4747

ttyd-tools/rel/include/assembly.h

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

99
// Assembly overwrite functions
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();
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();
2324

2425
// Functions accessed by assembly overwrites
2526
// main.cpp

0 commit comments

Comments
 (0)