Skip to content

Commit 4ca5bf1

Browse files
ZephilesZephiles
committed
Spawn Item & Fix Warnings
Added a code to spawn items at will, and fixed all of the warnings. Corrected some header stuff. Changed the header files to use camelCase. Changed the Makefile to treat warnings as errors. Set up the gitignore file to ignore bak files.
1 parent 4f43654 commit 4ca5bf1

36 files changed

+2024
-1811
lines changed

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
## Ignore Visual Studio temporary files, build results, and
22
## files generated by popular Visual Studio add-ons.
33

4+
# bak files
5+
*.bak
6+
47
# User-specific files
58
*.suo
69
*.user

‎ttyd-tools/rel/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ INCLUDES := include
5151

5252
MACHDEP = -mno-sdata -mgcn -DGEKKO -mcpu=750 -meabi -mhard-float
5353

54-
CFLAGS = -nostdlib -ffreestanding -ffunction-sections -fdata-sections -g -O3 -Wall $(MACHDEP) $(INCLUDE)
54+
CFLAGS = -nostdlib -ffreestanding -ffunction-sections -fdata-sections -g -O3 -Wall -Werror $(MACHDEP) $(INCLUDE)
5555
CXXFLAGS = -fno-exceptions -fno-rtti -std=gnu++17 $(CFLAGS)
5656

5757
LDFLAGS = -r -e _prolog -u _prolog -u _epilog -u _unresolved -Wl,--gc-sections -nostdlib -g $(MACHDEP) -Wl,-Map,$(notdir $@).map

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,11 @@ class Mod
105105
// Art Attack hitboxes
106106
void artAttackHitboxes();
107107

108+
// Spawn Item
109+
void spawnItem();
110+
uint8_t spawnItemNameCounter;
111+
bool spawnItemDisable = false;
112+
108113
// Enable Debug Mode
109114
void enableDebugMode();
110115

‎ttyd-tools/rel/include/ttyd.eu.lst‎

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,38 @@
277277
80088818:seq_logoExit
278278
8008885C:seq_logoInit
279279

280+
// itemdrv.o
281+
// 800AB8CC:itemPickUp
282+
// 800AB900:itemStatus
283+
// 800AB90C:itemStatusOn
284+
// 800AB91C:itemFlag
285+
// 800AB92C:itemFlagOff
286+
// 800AB93C:itemFlagOn
287+
// 800AB94C:itemNokoForceGet
288+
// 800AB9FC:itemForceGet
289+
// 800ABA30:itemHitCheckSide
290+
// 800ABEF4:itemSetPosition
291+
// 800ABF04:itemseq_Bound
292+
// 800ACD00:itemseq_GetItem
293+
// 800AE024:winFullDisp
294+
// 800AE12C:winHelpDisp
295+
// 800AE198:winHelpMain
296+
// 800AE1B8:winNameDisp2
297+
// 800AE304:winNameDisp
298+
// 800AE4B8:itemNearDistCheck
299+
// 800AE67C:itemHitCheck
300+
// 800AEA28:itemNameToPtr
301+
// 800AEAC4:itemDelete
302+
800AEBC0:itemEntry
303+
// 800AF3A0:itemModeChange
304+
// 800AF3B0:itemMain
305+
// 800AFA4C:unk_JP_US_PAL_023_800afa4c
306+
// 800AFAAC:itemGetNokoCheck
307+
// 800AFC40:itemGetCheck
308+
// 800AFE7C:itemCoinDrop
309+
// 800AFEF0:itemReInit
310+
// 800AFFE8:itemInit
311+
280312
// party.o
281313
// 800B7E70:partySetFamicomMode
282314
// 800B8264:partyShadowOff
@@ -686,7 +718,7 @@
686718
// 802711E8:strchr
687719
// 80271218:strncmp
688720
80271258:strcmp
689-
// 80271380:strcat
721+
80271380:strcat
690722
802713AC:strncpy
691723
802713F0:strcpy
692724
// 802714A8:strlen

‎ttyd-tools/rel/include/ttyd.jp.lst‎

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,6 +275,38 @@
275275
80085F50:seq_logoExit
276276
80085F94:seq_logoInit
277277

278+
// itemdrv.o
279+
// 800A8864:itemPickUp
280+
// 800A8898:itemStatus
281+
// 800A88A4:itemStatusOn
282+
// 800A88B4:itemFlag
283+
// 800A88C4:itemFlagOff
284+
// 800A88D4:itemFlagOn
285+
// 800A88E4:itemNokoForceGet
286+
// 800A8994:itemForceGet
287+
// 800A89C8:itemHitCheckSide
288+
// 800A8E8C:itemSetPosition
289+
// 800A8E9C:itemseq_Bound
290+
// 800A9C74:itemseq_GetItem
291+
// 800AAF98:winFullDisp
292+
// 800AB0A0:winHelpDisp
293+
// 800AB10C:winHelpMain
294+
// 800AB12C:winNameDisp2
295+
// 800AB228:winNameDisp
296+
// 800AB358:itemNearDistCheck
297+
// 800AB51C:itemHitCheck
298+
// 800AB8C8:itemNameToPtr
299+
// 800AB964:itemDelete
300+
800ABA60:itemEntry
301+
// 800AC298:itemModeChange
302+
// 800AC2A8:itemMain
303+
// 800AC944:unk_JP_US_PAL_023_800ac944
304+
// 800AC9A4:itemGetNokoCheck
305+
// 800ACB38:itemGetCheck
306+
// 800ACD74:itemCoinDrop
307+
// 800ACDE8:itemReInit
308+
// 800ACEE0:itemInit
309+
278310
// party.o
279311
// 800B52B4:partySetFamicomMode
280312
// 800B56A8:partyShadowOff
@@ -683,7 +715,7 @@
683715
// 802673DC:strchr
684716
// 8026740C:strncmp
685717
8026744C:strcmp
686-
// 80267574:strcat
718+
80267574:strcat
687719
802675A0:strncpy
688720
802675E4:strcpy
689721
// 8026769C:strlen

‎ttyd-tools/rel/include/ttyd.us.lst‎

Lines changed: 33 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,38 @@
277277
8008746C:seq_logoExit
278278
800874B0:seq_logoInit
279279

280+
// itemdrv.o
281+
// 800AA4FC:itemPickUp
282+
// 800AA530:itemStatus
283+
// 800AA53C:itemStatusOn
284+
// 800AA54C:itemFlag
285+
// 800AA55C:itemFlagOff
286+
// 800AA56C:itemFlagOn
287+
// 800AA57C:itemNokoForceGet
288+
// 800AA62C:itemForceGet
289+
// 800AA660:itemHitCheckSide
290+
// 800AAB24:itemSetPosition
291+
// 800AAB34:itemseq_Bound
292+
// 800AB930:itemseq_GetItem
293+
// 800ACC54:winFullDisp
294+
// 800ACD5C:winHelpDisp
295+
// 800ACDC8:winHelpMain
296+
// 800ACDE8:winNameDisp2
297+
// 800ACF34:winNameDisp
298+
// 800AD0E8:itemNearDistCheck
299+
// 800AD2AC:itemHitCheck
300+
// 800AD658:itemNameToPtr
301+
// 800AD6F4:itemDelete
302+
800AD7F0:itemEntry
303+
// 800ADFD0:itemModeChange
304+
// 800ADFE0:itemMain
305+
// 800AE67C:unk_JP_US_PAL_023_800ae67c
306+
// 800AE6DC:itemGetNokoCheck
307+
// 800AE870:itemGetCheck
308+
// 800AEAAC:itemCoinDrop
309+
// 800AEB20:itemReInit
310+
// 800AEC18:itemInit
311+
280312
// party.o
281313
// 800B713C:partySetFamicomMode
282314
// 800B7530:partyShadowOff
@@ -686,7 +718,7 @@
686718
// 8026D3F4:strchr
687719
// 8026D424:strncmp
688720
8026D464:strcmp
689-
// 8026D58C:strcat
721+
8026D58C:strcat
690722
8026D5B8:strncpy
691723
8026D5FC:strcpy
692724
// 8026D6B4:strlen

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ namespace ttyd::e_atan2 {
44

55
extern "C" {
66

7-
double __ieee754_atan2(double CoordinateX, double CoordinateY);
7+
double __ieee754_atan2(double coordinateX, double coordinateY);
88

99
}
1010

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

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
#pragma once
2+
3+
namespace ttyd::itemdrv {
4+
5+
extern "C" {
6+
7+
// itemPickUp
8+
// itemStatus
9+
// itemStatusOn
10+
// itemFlag
11+
// itemFlagOff
12+
// itemFlagOn
13+
// itemNokoForceGet
14+
// itemForceGet
15+
// itemHitCheckSide
16+
// itemSetPosition
17+
// itemseq_Bound
18+
// itemseq_GetItem
19+
// winFullDisp
20+
// winHelpDisp
21+
// winHelpMain
22+
// winNameDisp2
23+
// winNameDisp
24+
// itemNearDistCheck
25+
// itemHitCheck
26+
// itemNameToPtr
27+
// itemDelete
28+
void *itemEntry(const char *name, uint32_t id, uint32_t mode, int32_t wasCollectedExpr, uint32_t *pickupScript, float coordinateX, float coordinateY, float coordinateZ);
29+
// itemModeChange
30+
// itemMain
31+
// unk_JP_US_PAL_023_800ac944
32+
// itemGetNokoCheck
33+
// itemGetCheck
34+
// itemCoinDrop
35+
// itemReInit
36+
// itemInit
37+
38+
}
39+
40+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ extern "C" {
6969
// partyPaperOff
7070
// partyPaperOn
7171
// anotherPartyGetPtr
72-
uint32_t partyGetPtr(uint32_t marioGetPartyIdResult);
72+
void *partyGetPtr(uint32_t marioGetPartyIdResult);
7373

7474
}
7575

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@ extern "C" {
77
// strstr
88
// strchr
99
// strncmp
10-
int32_t strcmp(const char *String1, const char *String2);
11-
// strcat
12-
void strncpy(char *Destination, const char *SourceString, uint32_t AmountOfBytesToCopy);
13-
void strcpy(char *Destination, const char *SourceString);
10+
int32_t strcmp(const char *string1, const char *string2);
11+
char *strcat(char *destination, const char *sourceString);
12+
char *strncpy(char *destination, const char *sourceString, uint32_t amountOfBytesToCopy);
13+
char *strcpy(char *destination, const char *sourceString);
1414
// strlen
1515

1616
}

0 commit comments

Comments
 (0)