Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
243221e
EZTR stuff
Delcatty16 Mar 24, 2026
90c9602
Merge branch 'RecompRando:python-glue' into python-glue
Delcatty16 Mar 24, 2026
eeefe3b
Merge remote-tracking branch 'upstream/python-glue' into python-glue
Delcatty16 Mar 29, 2026
14ecdab
Merge pull request #1 from RecompRando/python-glue
Delcatty16 Mar 30, 2026
850d4e4
Merge pull request #2 from RecompRando/python-glue
Delcatty16 Apr 29, 2026
a73ae1f
whatever this is
Delcatty16 Apr 29, 2026
5a44d4f
Merge branch 'python-glue' of https://github.com/Delcatty16/MMRecompR…
Delcatty16 Apr 29, 2026
810a919
attempting to use the correct text boxes
Delcatty16 May 5, 2026
f5e027c
fix issues with items using EZTR text
ThatHypedPerson May 6, 2026
111f5a3
adjust formatting for eztr_text.c
ThatHypedPerson May 6, 2026
104890c
actually label rando item GIs for stray fairies/songs
ThatHypedPerson May 6, 2026
5852534
git is mad because of these extra spaces
ThatHypedPerson May 14, 2026
eb97c2d
update fork to match upstream
ThatHypedPerson May 14, 2026
1ec39a4
Merge remote-tracking branch 'upstream/python-glue' into python-glue
Delcatty16 May 14, 2026
490a71e
merge with upstream again
ThatHypedPerson May 15, 2026
22b33ab
Merge branch 'python-glue' of https://github.com/Delcatty16/MMRecompR…
Delcatty16 May 15, 2026
63ed91c
a bunch of stuff I don't remember, but the changelog might have some …
Delcatty16 May 28, 2026
90bffec
Tingle shop works correctly. Though long item names will make it look…
Delcatty16 May 28, 2026
f3c8eab
move shop text to EZTR + misc shop cleanup
ThatHypedPerson May 29, 2026
6bb1dd0
Rewiting of the Tingle text. Code has noticeably less Tingle than bef…
Delcatty16 May 30, 2026
d2ad8e6
Merge branch 'RecompRando:python-glue' into python-glue
Delcatty16 May 30, 2026
144bb82
Sanitized all item and player names, added Scrub text, Milk Bar text,…
Delcatty16 Jun 2, 2026
0bfefbb
merge with upstream
ThatHypedPerson Jun 2, 2026
ed86dae
remove item_text.c
ThatHypedPerson Jun 3, 2026
2803cb5
fix kotake blue potion + adjust lottery text + cleanup
ThatHypedPerson Jun 3, 2026
5233469
Merge remote-tracking branch 'upstream/python-glue' into python-glue
ThatHypedPerson Jun 3, 2026
1915b56
Added bank hint and cleaned up lottery hints more
Delcatty16 Jun 3, 2026
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
8 changes: 4 additions & 4 deletions include/apcommon.h
Original file line number Diff line number Diff line change
Expand Up @@ -344,21 +344,21 @@ typedef enum {
u8 randoItemGive(u32 gi);
u32 rando_get_item_id(u32 location_id);

typedef struct GetItemEntry {
typedef struct GetItemEntryAP {
/* 0x0 */ u8 itemId;
/* 0x1 */ u8 field; // various bit-packed data
/* 0x2 */ s16 gid; // defines the draw id and chest opening animation
/* 0x3 */ u8 textId;
/* 0x3 */ u16 textId;
/* 0x4 */ u16 objectId;
} GetItemEntry; // size = 0x6
} GetItemEntryAP; // size = 0x6

bool isAP(s16 gi);

u16 getObjectId(s16 gi);

s16 getGid(s16 gi);

u8 getTextId(s16 gi);
u16 getTextId(s16 gi);

extern s8 giToItemId[];

Expand Down
Loading