From f25493f84c588936461e7cc78d78cc1e4b18df0b Mon Sep 17 00:00:00 2001 From: BRODY MORAN Date: Mon, 23 May 2022 01:45:04 +0000 Subject: [PATCH 1/3] start working on in-game credits :p --- .gitpod.yml | 8 ++++++++ CREDITS.md | 2 +- src/data/credits.h | 17 +++++++++++++++++ 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 .gitpod.yml diff --git a/.gitpod.yml b/.gitpod.yml new file mode 100644 index 0000000..6c59e39 --- /dev/null +++ b/.gitpod.yml @@ -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 + + diff --git a/CREDITS.md b/CREDITS.md index f8753ba..22c341d 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -11,7 +11,7 @@ # 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. diff --git a/src/data/credits.h b/src/data/credits.h index 3ae2b1d..4316410 100644 --- a/src/data/credits.h +++ b/src/data/credits.h @@ -1,3 +1,5 @@ +// note to self: later on in the file, the TRUE/FALSE denotes headings. +// thanks to everyone <3 enum { PAGE_TITLE, @@ -57,6 +59,8 @@ enum PAGE_EXECUTIVE_DIRECTOR, PAGE_EXECUTIVE_PRODUCERS_1, PAGE_EXECUTIVE_PRODUCERS_2, + PAGE_ROM_HACKING, + PAGE_FEATURES, PAGE_COUNT }; @@ -221,6 +225,10 @@ 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_FeaturesBy[] = _("Features by:"); +static const u8 sCreditsText_Ghoulslash[] = _("ghoulslash"); 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 +388,8 @@ 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}; #define _ sCreditsEntry_EmptyString static const struct CreditsEntry *const sCreditsEntryPointerTable[PAGE_COUNT][ENTRIES_PER_PAGE] = @@ -783,5 +793,12 @@ static const struct CreditsEntry *const sCreditsEntryPointerTable[PAGE_COUNT][EN _, _, }, + [PAGE_ROM_HACKING] = { + _, + sCreditsEntry_RomHackingBy, + sCreditsEntry_SuperSonicSataa, + _, + _, + } }; #undef _ -- 2.40.1 From fa365a48cddc4dd7ed5ea2bbf5e4f1f4cfb9b0d0 Mon Sep 17 00:00:00 2001 From: BRODY MORAN Date: Mon, 23 May 2022 08:40:24 +0000 Subject: [PATCH 2/3] some more credits stuff --- CREDITS.md | 1 + src/data/credits.h | 24 ++++++++++++++++++++---- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/CREDITS.md b/CREDITS.md index 22c341d..a35a931 100644 --- a/CREDITS.md +++ b/CREDITS.md @@ -14,6 +14,7 @@ - @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. diff --git a/src/data/credits.h b/src/data/credits.h index 4316410..e8cd4df 100644 --- a/src/data/credits.h +++ b/src/data/credits.h @@ -1,4 +1,5 @@ // 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 { @@ -60,7 +61,7 @@ enum PAGE_EXECUTIVE_PRODUCERS_1, PAGE_EXECUTIVE_PRODUCERS_2, PAGE_ROM_HACKING, - PAGE_FEATURES, + PAGE_CODE, PAGE_COUNT }; @@ -227,8 +228,11 @@ 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_FeaturesBy[] = _("Features by:"); +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 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}; @@ -388,8 +392,13 @@ 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_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}; #define _ sCreditsEntry_EmptyString static const struct CreditsEntry *const sCreditsEntryPointerTable[PAGE_COUNT][ENTRIES_PER_PAGE] = @@ -799,6 +808,13 @@ static const struct CreditsEntry *const sCreditsEntryPointerTable[PAGE_COUNT][EN sCreditsEntry_SuperSonicSataa, _, _, - } + }, + [PAGE_CODE] = { + sCreditsEntry_SomeCodeBy, + sCreditsEntry_Ghoulslash, + sCreditsEntry_Louroboros, + sCreditsEntry_Asparagus, + sCreditsEntry_Dunsparce9, + }, }; #undef _ -- 2.40.1 From 30da637fa06ee5e7f2910aedb67a5f8edda4898d Mon Sep 17 00:00:00 2001 From: Brody M Date: Mon, 23 May 2022 11:41:57 +0000 Subject: [PATCH 3/3] Update credits.h (oops) --- src/data/credits.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/data/credits.h b/src/data/credits.h index e8cd4df..b3f6e5c 100644 --- a/src/data/credits.h +++ b/src/data/credits.h @@ -62,6 +62,7 @@ enum PAGE_EXECUTIVE_PRODUCERS_2, PAGE_ROM_HACKING, PAGE_CODE, + PAGE_SPECIAL_THANKS_6, PAGE_COUNT }; @@ -233,6 +234,7 @@ 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}; @@ -399,6 +401,7 @@ static const struct CreditsEntry sCreditsEntry_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] = @@ -816,5 +819,12 @@ static const struct CreditsEntry *const sCreditsEntryPointerTable[PAGE_COUNT][EN sCreditsEntry_Asparagus, sCreditsEntry_Dunsparce9, }, + [PAGE_SPECIAL_THANKS_6] = { + _, + sCreditsEntry_SpecialThanks, + sCreditsEntry_CreepyGuy, + _, + _, + }, }; #undef _ -- 2.40.1