tbld
/
tumbledemerald-legacy
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases 5 Wiki Activity

Merge branch '22.05.22' into 'main' 

Draft: Nightly 22.05.22

See merge request tbld/game!3
This commit is contained in:
Jess 2022-05-23 11:42:22 +00:00
parent 7a1befb261 30da637fa0
commit 68a881db9c
3 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.gitpod.yml Normal file
View File

@ -0,0 +1,8 @@
# This configuration file was automatically generated by Gitpod.
# Please adjust to your needs (see https://www.gitpod.io/docs/config-gitpod-file)
# and commit this file to your remote git repository to share the goodness with others.
tasks:
- init: make

3
CREDITS.md
View File

@ -11,9 +11,10 @@
# Cool people who put up with me on IRC:
- @sh4/@Daisenryaku: you know why. (yes, I'm still using that "clicky clicky `****` frontend" ;)
- @sh4/@Daisyenryaku: you know why. (yes, I'm still using that "clicky clicky `****` frontend" ;)
- @issotm: for running my awful sprite editing attempts through GIMP.
- @cosarara: for showing me how to use `CTRL`+`Shift`+`F` in VSCodium.
- @pokechu22: for helping me make sense of the total mess that is `src/data/credits.h`.
# Cool people who put up with me on Discord/GitHub:
- @Rangi42: sorry for sliding into ur dm's.

43
src/data/credits.h
View File

@ -1,3 +1,6 @@
// note to self: later on in the file, the TRUE/FALSE denotes headings.
// another note to self: the numbers go unused. (thanks pokechu22!)
// thanks to everyone <3
enum
{
PAGE_TITLE,
@ -57,6 +60,9 @@ enum
PAGE_EXECUTIVE_DIRECTOR,
PAGE_EXECUTIVE_PRODUCERS_1,
PAGE_EXECUTIVE_PRODUCERS_2,
PAGE_ROM_HACKING,
PAGE_CODE,
PAGE_SPECIAL_THANKS_6,
PAGE_COUNT
};
@ -221,6 +227,14 @@ static const u8 sCreditsText_MotoyasuTojima[] = _("Motoyasu Toji
static const u8 sCreditsText_NicolaPrattBarlow[] = _("Nicola Pratt-Barlow");
static const u8 sCreditsText_ShellieDow[] = _("Shellie Dow");
static const u8 sCreditsText_ErikJohnson[] = _("Erik Johnson");
static const u8 sCreditsText_RomHackingBy[] = _("Hacked by:");
static const u8 sCreditsText_SuperSonicSataa[] = _("sataa");
static const u8 sCreditsText_SomeCodeBy[] = _("Some code by:");
static const u8 sCreditsText_Ghoulslash[] = _("ghoulslash");
static const u8 sCreditsText_Louroboros[] = _("LOuroboros");
static const u8 sCreditsText_Asparagus[] = _("Asparagus");
static const u8 sCreditsText_Dunsparce9[] = _("dunsparce9");
static const u8 sCreditsText_CreepyGuy[] = __("creepyguy256");
static const struct CreditsEntry sCreditsEntry_EmptyString[] = { 0, FALSE, sCreditsText_EmptyString};
static const struct CreditsEntry sCreditsEntry_PkmnEmeraldVersion[] = { 7, TRUE, sCreditsText_PkmnEmeraldVersion};
static const struct CreditsEntry sCreditsEntry_Credits[] = {11, TRUE, sCreditsText_Credits};
@ -380,6 +394,14 @@ static const struct CreditsEntry sCreditsEntry_MotoyasuTojima[]
static const struct CreditsEntry sCreditsEntry_NicolaPrattBarlow[] = { 0, FALSE, sCreditsText_NicolaPrattBarlow};
static const struct CreditsEntry sCreditsEntry_ShellieDow[] = { 0, FALSE, sCreditsText_ShellieDow};
static const struct CreditsEntry sCreditsEntry_ErikJohnson[] = { 0, FALSE, sCreditsText_ErikJohnson};
static const struct CreditsEntry sCreditsEntry_RomHackingBy[] = { 0, TRUE, sCreditsText_RomHackingBy};
static const struct CreditsEntry sCreditsEntry_SuperSonicSataa[] = { 0, FALSE, sCreditsText_SuperSonicSataa};
static const struct CreditsEntry sCreditsEntry_SomeCodeBy[] = { 0, TRUE, sCreditsText_SomeCodeBy};
static const struct CreditsEntry sCreditsEntry_Ghoulslash[] = { 0, FALSE, sCreditsText_Ghoulslash};
static const struct CreditsEntry sCreditsEntry_Louroboros[] = { 0, FALSE, sCreditsText_Louroboros};
static const struct CreditsEntry sCreditsEntry_Asparagus[] = { 0, FALSE, sCreditsText_Asparagus};
static const struct CreditsEntry sCreditsEntry_Dunsparce9[] = { 0, FALSE, sCreditsText_Dunsparce9};
static const struct CreditsEntry sCreditsEntry_CreepyGuy[] = { 0, FALSE, sCreditsText_CreepyGuy};
#define _ sCreditsEntry_EmptyString
static const struct CreditsEntry *const sCreditsEntryPointerTable[PAGE_COUNT][ENTRIES_PER_PAGE] =
@ -783,5 +805,26 @@ static const struct CreditsEntry *const sCreditsEntryPointerTable[PAGE_COUNT][EN
_,
_,
},
[PAGE_ROM_HACKING] = {
_,
sCreditsEntry_RomHackingBy,
sCreditsEntry_SuperSonicSataa,
_,
_,
},
[PAGE_CODE] = {
sCreditsEntry_SomeCodeBy,
sCreditsEntry_Ghoulslash,
sCreditsEntry_Louroboros,
sCreditsEntry_Asparagus,
sCreditsEntry_Dunsparce9,
},
[PAGE_SPECIAL_THANKS_6] = {
_,
sCreditsEntry_SpecialThanks,
sCreditsEntry_CreepyGuy,
_,
_,
},
};
#undef _