thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2026-02-06 16:15:24 +13:00
Code Issues Projects Releases Packages Wiki Activity Actions

Initial giant enby Commit

Browse source 
- Changed name lists
- Made Overworld pink palette into purple palette
- Changed gender selection options
- Added Topaz's graphics (Enby Trainer)
- Changed more or less every gender check in the game to account for enby option
- Changed out Morty's palette on  the trainer card to a more purple one to facilitate Topaz's graphics

KNOWN ISSUES / THINGS TO CHANGE
- Topaz's sprite does not currently render correctly on town map (check if this is a map issue or if it occasionally will pop up elsewhere as well)
- Bag Palette is still green like the tutorial made it. Might change it to yellow or something later on.
This commit is contained in:
Zeta_Null 2023-09-11 11:26:46 -04:00
parent 5a182b17f0
commit b3a3e27906
57 changed files with 553 additions and 177 deletions
Download patch file Download diff file Expand all files Collapse all files

69
maps/CopycatsHouse2F.asm
View file

@ -5,6 +5,7 @@
const COPYCATSHOUSE2F_MONSTERDOLL
const COPYCATSHOUSE2F_BIRDDOLL
const COPYCATSHOUSE2F_COPYCAT2 ; if player is female
const COPYCATSHOUSE2F_COPYCAT3 ; if player is enby
CopycatsHouse2F_MapScripts:
def_scene_scripts
@ -13,14 +14,22 @@ CopycatsHouse2F_MapScripts:
callback MAPCALLBACK_OBJECTS, CopycatsHouse2FWhichGenderCallback
CopycatsHouse2FWhichGenderCallback:
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .Female
readvar VAR_PLAYERGENDER
ifequal FEMALE, .Female
ifequal ENBY, .Enby
disappear COPYCATSHOUSE2F_COPYCAT2
disappear COPYCATSHOUSE2F_COPYCAT3
appear COPYCATSHOUSE2F_COPYCAT1
sjump .Done
.Female:
disappear COPYCATSHOUSE2F_COPYCAT1
disappear COPYCATSHOUSE2F_COPYCAT3
appear COPYCATSHOUSE2F_COPYCAT2
sjump .Done
.Enby:
disappear COPYCATSHOUSE2F_COPYCAT1
disappear COPYCATSHOUSE2F_COPYCAT2
appear COPYCATSHOUSE2F_COPYCAT3
.Done:
endcallback
@ -32,8 +41,9 @@ Copycat:
iftrue .TryGivePassAgain
checkitem LOST_ITEM
iftrue .ReturnLostItem
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .Default_Female_1
readvar VAR_PLAYERGENDER
ifequal FEMALE, .Default_Female_1
ifequal ENBY, .Default_Enby_1
applymovement COPYCATSHOUSE2F_COPYCAT1, CopycatSpinAroundMovementData
faceplayer
variablesprite SPRITE_COPYCAT, SPRITE_CHRIS
@ -43,12 +53,18 @@ Copycat:
applymovement COPYCATSHOUSE2F_COPYCAT2, CopycatSpinAroundMovementData
faceplayer
variablesprite SPRITE_COPYCAT, SPRITE_KRIS
sjump .Default_Merge_1
.Default_Enby_1:
applymovement COPYCATSHOUSE2F_COPYCAT3, CopycatSpinAroundMovementData
faceplayer
variablesprite SPRITE_COPYCAT, SPRITE_ENBY
.Default_Merge_1:
special LoadUsedSpritesGFX
checkevent EVENT_RETURNED_MACHINE_PART
iftrue .TalkAboutLostItem
opentext
checkflag ENGINE_PLAYER_IS_FEMALE
readvar VAR_PLAYERGENDER
iftrue .Default_Female_2a
writetext CopycatText_Male_1
sjump .Default_Merge_2a
@ -58,11 +74,16 @@ Copycat:
.Default_Merge_2a:
waitbutton
closetext
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .Default_Female_3a
readvar VAR_PLAYERGENDER
ifequal FEMALE, .Default_Female_3a
ifequal ENBY, .Default_Enby_3a
applymovement COPYCATSHOUSE2F_COPYCAT1, CopycatSpinAroundMovementData
sjump .Default_Merge_3a
.Default_Enby_3a:
applymovement COPYCATSHOUSE2F_COPYCAT3, CopycatSpinAroundMovementData
sjump .Default_Merge_3a
.Default_Female_3a:
applymovement COPYCATSHOUSE2F_COPYCAT2, CopycatSpinAroundMovementData
.Default_Merge_3a:
@ -77,7 +98,7 @@ Copycat:
.TalkAboutLostItem:
opentext
checkflag ENGINE_PLAYER_IS_FEMALE
readvar VAR_PLAYERGENDER
iftrue .Default_Female_2b
writetext CopycatText_Male_2
sjump .Default_Merge_2b
@ -87,13 +108,18 @@ Copycat:
.Default_Merge_2b:
waitbutton
closetext
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .Default_Female_3b
readvar VAR_PLAYERGENDER
ifequal FEMALE, .Default_Female_3b
ifequal ENBY, .Default_Enby_3b
applymovement COPYCATSHOUSE2F_COPYCAT1, CopycatSpinAroundMovementData
sjump .Default_Merge_3b
.Default_Female_3b:
applymovement COPYCATSHOUSE2F_COPYCAT2, CopycatSpinAroundMovementData
sjump .Default_Merge_3b
.Default_Enby_3b:
applymovement COPYCATSHOUSE2F_COPYCAT3, CopycatSpinAroundMovementData
.Default_Merge_3b:
faceplayer
variablesprite SPRITE_COPYCAT, SPRITE_LASS
@ -128,8 +154,9 @@ Copycat:
end
.GotPass:
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .GotPass_Female_1
readvar VAR_PLAYERGENDER
ifequal FEMALE, .GotPass_Female_1
ifequal ENBY, .GotPass_Enby_1
applymovement COPYCATSHOUSE2F_COPYCAT1, CopycatSpinAroundMovementData
faceplayer
variablesprite SPRITE_COPYCAT, SPRITE_CHRIS
@ -139,10 +166,16 @@ Copycat:
applymovement COPYCATSHOUSE2F_COPYCAT2, CopycatSpinAroundMovementData
faceplayer
variablesprite SPRITE_COPYCAT, SPRITE_KRIS
sjump .GotPass_Merge_1
.GotPass_Enby_1:
applymovement COPYCATSHOUSE2F_COPYCAT3, CopycatSpinAroundMovementData
faceplayer
variablesprite SPRITE_COPYCAT, SPRITE_ENBY
.GotPass_Merge_1:
special LoadUsedSpritesGFX
opentext
checkflag ENGINE_PLAYER_IS_FEMALE
readvar VAR_PLAYERGENDER
iftrue .GotPass_Female_2
writetext CopycatText_Male_3
sjump .GotPass_Merge_2
@ -152,13 +185,18 @@ Copycat:
.GotPass_Merge_2:
waitbutton
closetext
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .GotPass_Female_3
readvar VAR_PLAYERGENDER
ifequal FEMALE, .GotPass_Female_3
ifequal ENBY, .GotPass_Enby_3
applymovement COPYCATSHOUSE2F_COPYCAT1, CopycatSpinAroundMovementData
sjump .GotPass_Merge_3
.GotPass_Female_3:
applymovement COPYCATSHOUSE2F_COPYCAT2, CopycatSpinAroundMovementData
sjump .GotPass_Merge_3
.GotPass_Enby_3:
applymovement COPYCATSHOUSE2F_COPYCAT3, CopycatSpinAroundMovementData
.GotPass_Merge_3:
faceplayer
variablesprite SPRITE_COPYCAT, SPRITE_LASS
@ -377,3 +415,4 @@ CopycatsHouse2F_MapEvents:
object_event 2, 1, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, -1
object_event 7, 1, SPRITE_BIRD, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, CopycatsHouse2FDoll, -1
object_event 4, 3, SPRITE_COPYCAT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_BLUE, OBJECTTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_2
object_event 4, 3, SPRITE_COPYCAT, SPRITEMOVEDATA_STANDING_LEFT, 0, 0, -1, -1, PAL_NPC_PURPLE, OBJECTTYPE_SCRIPT, 0, Copycat, EVENT_COPYCAT_3

19
maps/DanceTheater.asm
View file

@ -89,8 +89,9 @@ DanceTheaterSurfGuy:
sjump .GetSurf
.KimonoGirlsUndefeated:
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .PlayerIsFemale
readvar VAR_PLAYERGENDER
if_equal FEMALE, .PlayerIsFemale
if_equal ENBY, .PlayerIsEnby
writetext SurfGuyLadGiftText
waitbutton
closetext
@ -101,6 +102,12 @@ DanceTheaterSurfGuy:
waitbutton
closetext
end
.PlayerIsEnby:
writetext SurfGuyChildGiftText
waitbutton
closetext
end
.GetSurf:
writetext SurfGuyLikeADanceText
@ -263,6 +270,14 @@ SurfGuyLassieGiftText:
para "KIMONO GIRLS, I'll"
line "give you a gift."
done
SurfGuyChildGiftText:
text "Pal, if you can"
line "defeat all the"
para "KIMONO GIRLS, I'll"
line "give you a gift."
done
SurfGuyLikeADanceText:
text "The way you bat-"

23
maps/FastShipCabins_SE_SSE_CaptainsCabin.asm
View file

@ -59,8 +59,9 @@ SSAquaGranddaughterBefore:
showemote EMOTE_SHOCK, FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, 15
applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN1, SSAquaGranddaughterEntersCabinMovement
turnobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, RIGHT
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .PlayerIsFemale
readvar VAR_PLAYERGENDER
ifequal FEMALE, .PlayerIsFemale
ifequal ENBY, .PlayerIsEnby
opentext
writetext SSAquaGranddaughterWasPlayingMText
waitbutton
@ -72,6 +73,14 @@ SSAquaGranddaughterBefore:
writetext SSAquaGranddaughterWasPlayingFText
waitbutton
closetext
sjump .cont
.PlayerIsEnby:
opentext
writetext SSAquaGranddaughterWasPlayingNBText
waitbutton
closetext
sjump .cont
.cont:
turnobject FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_TWIN2, DOWN
applymovement FASTSHIPCABINS_SE_SSE_CAPTAINSCABIN_GENTLEMAN, SSAquaGrandpaApproachesPlayerMovement
@ -330,12 +339,20 @@ SSAquaGranddaughterWasPlayingFText:
para "with the CAPTAIN"
line "and this big girl!"
done
SSAquaGranddaughterWasPlayingNBText:
text "Grandpa, here I"
line "am! I was playing"
para "with the CAPTAIN"
line "and this kid!"
done
SSAquaGranddaughterHadFunText:
text "I had lots of fun"
line "playing!"
done
PokefanmColinSeenText:
text "Hey, kid! Want to"
line "battle with me?"

28
maps/Pokecenter2F.asm
View file

@ -411,8 +411,8 @@ Script_WalkOutOfMobileBattleRoom:
end
Pokecenter2F_CheckGender:
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .Female
readvar VAR_PLAYERGENDER
ifnotequal MALE, .Female
applymovementlasttalked Pokecenter2FMovementData_ReceptionistWalksUpAndLeft_LookRight
applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesThreeStepsUp
end
@ -459,8 +459,7 @@ Script_WalkOutOfLinkTradeRoom:
clearflag ENGINE_KRIS_IN_CABLE_CLUB
playsound SFX_TINGLE
applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight
setval (PAL_NPC_BLUE << 4)
special SetPlayerPalette
scall Script_RestorePlayerColor
applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft
special UpdatePlayerSprite
applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsDown_2
@ -481,8 +480,7 @@ Script_WalkOutOfLinkBattleRoom:
clearflag ENGINE_KRIS_IN_CABLE_CLUB
playsound SFX_TINGLE
applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight
setval (PAL_NPC_BLUE << 4)
special SetPlayerPalette
scall Script_RestorePlayerColor
applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft
special UpdatePlayerSprite
applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesTwoStepsDown_2
@ -490,8 +488,8 @@ Script_WalkOutOfLinkBattleRoom:
end
TimeCapsuleScript_CheckPlayerGender:
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .Female
readvar VAR_PLAYERGENDER
ifnotequal MALE, .Female
readvar VAR_FACING
ifequal LEFT, .MaleFacingLeft
ifequal RIGHT, .MaleFacingRight
@ -569,8 +567,7 @@ Script_LeftTimeCapsule:
clearflag ENGINE_KRIS_IN_CABLE_CLUB
playsound SFX_TINGLE
applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingRight
setval (PAL_NPC_BLUE << 4)
special SetPlayerPalette
scall Script_RestorePlayerColor
applymovement PLAYER, Pokecenter2FMovementData_PlayerSpinsClockwiseEndsFacingLeft
special UpdatePlayerSprite
applymovement PLAYER, Pokecenter2FMovementData_PlayerTakesOneStepDown
@ -580,6 +577,17 @@ Script_LeftTimeCapsule:
setmapscene TIME_CAPSULE, SCENE_TIMECAPSULE_INITIALIZE
end
Script_RestorePlayerColor:
readvar VAR_PLAYERGENDER
ifequal FEMALE, .Blue
setval (PAL_NPC_PURPLE << 4)
special SetPlayerPalette
end
.Blue
setval (PAL_NPC_BLUE << 4)
special SetPlayerPalette
end
Pokecenter2FLinkRecordSign:
refreshscreen
special DisplayLinkRecord

17
maps/Route37.asm
View file

@ -69,15 +69,8 @@ SunnyScript:
promptbutton
setevent EVENT_MET_SUNNY_OF_SUNDAY
.MetSunny:
checkflag ENGINE_PLAYER_IS_FEMALE
iftrue .Kris
writetext SunnyGivesGiftText1
writetext SunnyGivesGiftText
promptbutton
sjump .next
.Kris:
writetext SunnyGivesGiftText2
promptbutton
.next
verbosegiveitem MAGNET
iffalse SunnyDoneScript
setevent EVENT_GOT_MAGNET_FROM_SUNNY
@ -179,13 +172,7 @@ MeetSunnyText:
cont "Sunday today!"
done
SunnyGivesGiftText1:
text "I was told to give"
line "you this if I saw"
cont "you!"
done
SunnyGivesGiftText2:
SunnyGivesGiftText:
text "I was told to give"
line "you this if I saw"
cont "you!"