From b03e9ffc6eb22921c2b6e0916db7b06b24287a2a Mon Sep 17 00:00:00 2001 From: Llinos Evans <36418502+PlagueVonKarma@users.noreply.github.com> Date: Mon, 15 May 2023 18:01:28 +0100 Subject: [PATCH] Credit additions This modifies the credits to have a KEP staff version. It's a little awkward aesthetically! But this should be used and expanded on in the future - people don't read readmes, so the people who've helped should be credited. --- constants/credits_constants.asm | 20 +++++++++++ data/credits/credits_mons.asm | 4 +++ data/credits/credits_order.asm | 6 ++++ data/credits/credits_text.asm | 60 +++++++++++++++++++++++++++++++++ engine/debug/debug_party.asm | 23 +++++++++++-- 5 files changed, 111 insertions(+), 2 deletions(-) diff --git a/constants/credits_constants.asm b/constants/credits_constants.asm index ba62012b..ad25c7ed 100644 --- a/constants/credits_constants.asm +++ b/constants/credits_constants.asm @@ -64,6 +64,26 @@ const CRED_FUKUI ; $3D const CRED_CLUB ; $3E const CRED_PAAD ; $3F + const CRED_KEP_STAFF + const CRED_KEP_DEVS + const CRED_PVK + const CRED_MAH + const CRED_EMA + const CRED_KEP_SPRITES + const CRED_ALBA + const CRED_HELIX + const CRED_FO + const CRED_PS_DEVS + const CRED_AUS + const CRED_PAUL + const CRED_DUO + const CRED_KEP_THANKS + const CRED_FRRF + const CRED_DANNYE + const CRED_EROSUNICA + const CRED_CHATOT + const CRED_ENI + const CRED_VORT DEF NUM_CRED_STRINGS EQU const_value const_def -1, -1 diff --git a/data/credits/credits_mons.asm b/data/credits/credits_mons.asm index 5af4a309..f74430f0 100644 --- a/data/credits/credits_mons.asm +++ b/data/credits/credits_mons.asm @@ -15,3 +15,7 @@ CreditsMons: db VILEPLUME db NIDOKING db PARASECT + db TAUROS_P + db CRYITHAN + db SANDY_SHOCKS + db TANGROWTH diff --git a/data/credits/credits_order.asm b/data/credits/credits_order.asm index f8454e91..5111e50d 100644 --- a/data/credits/credits_order.asm +++ b/data/credits/credits_order.asm @@ -36,5 +36,11 @@ CreditsOrder: db CRED_TEST, CRED_PAAD, CRED_CLUB, CRED_TEXT_FADE db CRED_PRODUCER, CRED_IZUSHI, CRED_TEXT_FADE db CRED_EXECUTIVE, CRED_YAMAUCHI, CRED_TEXT_FADE_MON + db CRED_KEP_STAFF, CRED_TEXT_FADE + db CRED_KEP_DEVS, CRED_PVK, CRED_MAH, CRED_EMA, CRED_TEXT_FADE_MON + db CRED_KEP_SPRITES, CRED_ALBA, CRED_HELIX, CRED_FO, CRED_TEXT_FADE_MON + db CRED_PS_DEVS, CRED_AUS, CRED_PAUL, CRED_DUO, CRED_TEXT_FADE_MON + db CRED_KEP_THANKS, CRED_FRRF, CRED_DANNYE, CRED_EROSUNICA, CRED_TEXT_FADE + db CRED_KEP_THANKS, CRED_CHATOT, CRED_ENI, CRED_VORT, CRED_TEXT_FADE_MON db CRED_COPYRIGHT, CRED_TEXT_FADE_MON db CRED_THE_END diff --git a/data/credits/credits_text.asm b/data/credits/credits_text.asm index dab24c73..985b4606 100644 --- a/data/credits/credits_text.asm +++ b/data/credits/credits_text.asm @@ -65,6 +65,26 @@ CreditsTextPointers: dw CredFukui dw CredClub dw CredPAAD + dw CredKEP + dw CredKEPDevs + dw CredPvK + dw CredMAH + dw CredEma + dw CredKEPSprites + dw CredAlba + dw CredHelix + dw CredFO + dw CredPSDevs + dw CredAus + dw CredPaul + dw CredDuo + dw CredKEPThanks + dw CredFrrf + dw CredDannye + dw CredEro + dw CredChatot + dw CredEni + dw CredVort assert_table_length NUM_CRED_STRINGS CredVersion: @@ -195,3 +215,43 @@ CredClub: db -9, "NCL SUPER MARIO CLUB@" CredPAAD: db -5, "PAAD TESTING@" +CredKEP: + db -5, "KEP STAFF@" +CredKEPDevs: + db -4, "KEP DEVELOPERS@" +CredPvK: + db -5, "PLAGUE VON KARMA@" +CredMAH: + db -6, "MEMENTOMARTHA@" +CredEma: + db -7, "EMA SKYE@" +CredKEPSprites: + db -4, "KEP SPRITES@" +CredAlba: + db -5, "ALBATROSS@" +CredHelix: + db -6, "HELIX CHAMBER@" +CredFO: + db -7, "FRENCH ORANGE@" +CredPSDevs: + db -4, "SHOWDOWN MOD@" +CredAus: + db -5, "AUSMA@" +CredPaul: + db -6, "PAULLUXX@" +CredDuo: + db -7, "DUOM2@" +CredKEPThanks: + db -4, "SPECIAL THANKS@" +CredFrrf: + db -5, "FRRF@" +CredDannye: + db -6, "DANNYE33@" +CredEro: + db -7, "EROSUNICA@" +CredChatot: + db -8, "CHATOT4444@" +CredEni: + db -9, "ENIGAMI@" +CredVort: + db -10, "VORTIENE@" diff --git a/engine/debug/debug_party.asm b/engine/debug/debug_party.asm index 37ec5109..d8237fae 100644 --- a/engine/debug/debug_party.asm +++ b/engine/debug/debug_party.asm @@ -25,7 +25,7 @@ IshiharaTeam: db PURAKKUSU, 90 db TRAMPEL, 90 IF DEF(_DEBUG) - db TAUROS_PB, 50 + db TAUROS_PB, 90 db SNORLAX, 50 db TANGROWTH, 50 ENDC @@ -78,7 +78,26 @@ IF DEF(_DEBUG) ld hl, wPartyMon3PP + 3 ld a, 15 ld [hl], a - + + ; Blaze Tauros (Pokemon 4) has a full moveset + ld hl, wPartyMon4Moves + ld a, FIRE_BLAST + ld [hli], a + ld a, LOW_KICK + ld [hli], a + ld a, FIRE_SPIN + ld [hli], a + ld a, HYPER_BEAM + ld [hl], a + ld hl, wPartyMon1PP + ld a, 99 + ld [hli], a + ld a, 99 + ld [hli], a + ld a, 99 + ld [hli], a + ld [hl], a + ; Articuno (Pokemon 5) gets Fly. ld hl, wPartyMon5Moves ld a, FLY