Skip to content

Commit 446c850

Browse files
ZephilesZephiles
committed
Slight Code Cleanup
Cleaned up a bit of the code, and separated Palace Skip, Yoshi Skip, and the Button Input into their own files.
1 parent 06bd734 commit 446c850

File tree

16 files changed

+605
-281
lines changed

16 files changed

+605
-281
lines changed

‎ttyd-tools/rel/Makefile‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,15 @@ LDFLAGS = -r -e _prolog -u _prolog -u _epilog -u _unresolved -Wl,--gc-sections
6060
ifeq ($(VERSION),us)
6161
CFLAGS += -DTTYD_US
6262
GAMECODE = "G8ME"
63+
PRINTVER = "US"
6364
else ifeq ($(VERSION),jp)
6465
CFLAGS += -DTTYD_JP
6566
GAMECODE = "G8MJ"
67+
PRINTVER = "JP"
6668
else ifeq ($(VERSION),eu)
6769
CFLAGS += -DTTYD_EU
6870
GAMECODE = "G8MP"
71+
PRINTVER = "EU"
6972
endif
7073

7174

@@ -121,7 +124,14 @@ export HFILES := $(addsuffix .h,$(subst .,_,$(BINFILES)))
121124
# For REL linking
122125
export LDFILES := $(foreach dir,$(SOURCES),$(notdir $(wildcard $(dir)/*.ld)))
123126
export MAPFILE := $(CURDIR)/include/ttyd.$(VERSION).lst
124-
export BANNERFILE := $(CURDIR)/banner.raw
127+
# export BANNERFILE := $(CURDIR)/banner.raw
128+
ifeq ($(VERSION),us)
129+
export BANNERFILE := $(CURDIR)/banner_us.raw
130+
else ifeq ($(VERSION),jp)
131+
export BANNERFILE := $(CURDIR)/banner_jp.raw
132+
else ifeq ($(VERSION),eu)
133+
export BANNERFILE := $(CURDIR)/banner_us.raw
134+
endif
125135
export ICONFILE := $(CURDIR)/icon.raw
126136

127137
#---------------------------------------------------------------------------------
@@ -172,7 +182,7 @@ $(OFILES_SOURCES) : $(HFILES)
172182

173183
%.gci: %.rel
174184
@echo packing ... $(notdir $@)
175-
@$(GCIPACK) $< "rel" "Paper Mario" "TTYD Practice Codes ($(VERSION))" $(BANNERFILE) $(ICONFILE) $(GAMECODE)
185+
@$(GCIPACK) $< "rel" "Paper Mario" "TTYD Practice Codes ($(PRINTVER))" $(BANNERFILE) $(ICONFILE) $(GAMECODE)
176186

177187
#---------------------------------------------------------------------------------
178188
# This rule links in binary data with the .jpg extension

‎ttyd-tools/rel/banner_jp.raw‎

6 KB
Binary file not shown.

‎ttyd-tools/rel/banner.raw‎ renamed to ‎ttyd-tools/rel/banner_us.raw‎

File renamed without changes.

‎ttyd-tools/rel/include/mod.h‎

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,16 @@ class Mod
1414

1515
private:
1616
void updateEarly();
17-
void drawPS();
18-
void drawYS();
17+
18+
//Palace Skip
19+
void updateEarlyPalaceSkip();
20+
void drawPalaceSkip();
21+
22+
//Yoshi Skip
23+
void updateEarlyYoshiSkip();
24+
void drawYoshiSkip();
25+
26+
//Button Display
1927
void drawButtonsDisplay();
2028

2129
private:

‎ttyd-tools/rel/include/ttyd/e_atan2.h‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#pragma once
2+
3+
namespace ttyd::e_atan2 {
4+
5+
extern "C" {
6+
7+
double __ieee754_atan2(float CoordinateX, float CoordinateY);
8+
9+
}
10+
11+
}

‎ttyd-tools/rel/include/ttyd/global.h‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
#pragma once
2+
3+
#include <cstdint>
4+
5+
//Enumerations
6+
enum PAD_INPUTS : uint16_t
7+
{
8+
PAD_DPAD_LEFT = 0x0001,
9+
PAD_DPAD_RIGHT = 0x0002,
10+
PAD_DPAD_DOWN = 0x0004,
11+
PAD_DPAD_UP = 0x0008,
12+
PAD_Z = 0x0010,
13+
PAD_R = 0x0020,
14+
PAD_L = 0x0040,
15+
PAD_A = 0x0100,
16+
PAD_B = 0x0200,
17+
PAD_X = 0x0400,
18+
PAD_Y = 0x0800,
19+
PAD_START = 0x1000,
20+
};
21+
22+
//Global Variables
23+
extern uint32_t r13;
24+
extern char *las_25;
25+
extern char *tik_07;
26+
extern char *CurrentRoom;
27+
extern float NoPointer;
28+
extern uint32_t mResetCounter;

‎ttyd-tools/rel/include/ttyd/mario.h‎

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
1+
#pragma once
2+
3+
namespace ttyd::mario {
4+
5+
extern "C" {
6+
7+
// toFrontPose
8+
// toRearPose
9+
// marioDisp
10+
// marioDispBlur
11+
// marioDispBlurSub
12+
// marioPreDisp
13+
// marioRearAnime
14+
// marioMakeDispDir
15+
// marioGetScale
16+
// marioChkInScreen
17+
// marioGetScreenPos
18+
// marioPaperLightOff
19+
// marioPaperLightOn
20+
// marioPaperOff
21+
// marioPaperOn
22+
// marioSetPaperAnimeLocalTime
23+
// marioChgPaper
24+
// marioChgPoseTime
25+
// marioChgPose
26+
// toDotMarioPose
27+
// marioChgEvtPose
28+
// unk_JP_US_PAL_005_80058374
29+
// marioAnimeId
30+
// marioChkPushAnime
31+
// marioMoveMain
32+
// marioMove
33+
// marioCtrlOff2Main
34+
// marioMain
35+
// marioReInit
36+
// marioInit
37+
// marioPoseInit
38+
// marioSoundInit
39+
// marioOfsRotReset
40+
// marioReset
41+
// marioResetHitObj
42+
// marioChkSts
43+
// marioBgmodeOff
44+
// marioBgmodeOn
45+
// marioBgmodeChk
46+
// marioSetMutekiTime
47+
// marioKeyOn
48+
// marioKeyOff
49+
// marioCtrlOn2
50+
// marioCtrlOff2
51+
// marioCtrlOn
52+
// marioCtrlOff
53+
// marioKeyOffChk
54+
// marioCtrlOffChk
55+
// marioFBattlePost
56+
// marioFBattlePrepare
57+
// unk_JP_US_PAL_006_8005b5a8
58+
// marioChkCtrl
59+
// marioChkKey
60+
// marioCheckMenuDisable
61+
// unk_JP_US_PAL_007_8005bb80
62+
// marioCaseEventValidChk
63+
// marioItemGetOk
64+
// marioItemGetChk
65+
// marioItemGetDisable
66+
// marioEntry
67+
// marioSetSpec
68+
// marioSetFamicomMode
69+
// marioSetCharMode
70+
// marioGetColor
71+
uint32_t marioGetPtr();
72+
73+
}
74+
75+
}

‎ttyd-tools/rel/include/ttyd/mario_party.h‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
#pragma once
2+
3+
namespace ttyd::mario_party {
4+
5+
extern "C" {
6+
7+
// partyGetTechLv
8+
// partyGetHp
9+
// partyChkJoin
10+
// partyLeft
11+
// partyJoin
12+
// marioGetExtraPartyId
13+
uint32_t marioGetPartyId();
14+
// marioGetParty
15+
// marioPartyKill
16+
// marioPartyGoodbye
17+
// marioPartyHello
18+
// marioPartyEntry
19+
// unk_JP_US_PAL_062_8013be14
20+
// marioUseParty
21+
22+
}
23+
24+
}

‎ttyd-tools/rel/include/ttyd/party.h‎

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
#pragma once
2+
3+
namespace ttyd::party {
4+
5+
extern "C" {
6+
7+
// partySetFamicomMode
8+
// partyShadowOff
9+
// partyUpdateKeyData
10+
// partyClearCont
11+
// partyKeyOff
12+
// partyKeyOn
13+
// partyDisp
14+
// partyPreDisp
15+
// partyMakeDispDir
16+
// partySetCamId
17+
// partyInitCamId
18+
// party_damage_return
19+
// partyRideYoshiMain
20+
// party_ride_yoshi_force_move
21+
// party_force_ride_yoshi
22+
// partyRideMain
23+
// partyRideChk
24+
// allPartyRideOff2
25+
// allPartyRideOff
26+
// unk_JP_US_PAL_029_800b7bcc
27+
// allPartyForceRideOn
28+
// getRidePos
29+
// allPartyRideShip
30+
// allPartyRidePlane
31+
// partyDokanEnd
32+
// partyDokanMain
33+
// partyDokanInit
34+
// partyGoodbyeMain
35+
// partyGoodbyeInit
36+
// partyHelloMain
37+
// partyHello
38+
// partyDoWork
39+
// driveParty
40+
// partyMain
41+
// unk_JP_US_PAL_030_800ba2dc
42+
// unk_JP_US_PAL_031_800ba72c
43+
// unk_JP_US_PAL_032_800ba7a8
44+
// partyChgRunMode
45+
// partyUsePost
46+
// partyReInit
47+
// partyInit
48+
// partyEntry2Pos
49+
// partyEntry2Hello
50+
// partyEntry2
51+
// partyEntryMain
52+
// partyGetHeight
53+
// yoshiSetColor
54+
// partyKill2
55+
// partyKill
56+
// partyGoodbye
57+
// partyEntryPos
58+
// partyEntry
59+
// partyEntryHello
60+
// partySetForceMove
61+
// partyStop
62+
// partyRun
63+
// partyCtrlOn
64+
// partyCtrlOff
65+
// partyChgPaper
66+
// partyChgPose
67+
// partyChgPoseId
68+
// partyPaperLightOff
69+
// partyPaperOff
70+
// partyPaperOn
71+
// anotherPartyGetPtr
72+
uint32_t partyGetPtr(uint32_t IDResult);
73+
74+
}
75+
76+
}

‎ttyd-tools/rel/include/ttyd/string.h‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
#pragma once
2+
3+
namespace ttyd::string {
4+
5+
extern "C" {
6+
7+
// strstr
8+
// strchr
9+
// strncmp
10+
uint32_t strcmp(const char *string1, const char *string2);
11+
// strcat
12+
// strncpy
13+
// strcpy
14+
// strlen
15+
16+
}
17+
18+
}

0 commit comments

Comments
 (0)