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

71
engine/gfx/cgb_layouts.asm
View file

@ -177,9 +177,12 @@ InitPartyMenuBGPal0:
_CGB_PokegearPals:
ld a, [wPlayerGender]
bit PLAYERGENDER_FEMALE_F, a
and a ; MALE
jr z, .male
ld hl, FemalePokegearPals
dec a ; FEMALE
jr z, .got_pals
ld hl, EnbyPokegearPals
jr .got_pals
.male
@ -628,7 +631,7 @@ _CGB_TrainerCard:
ld a, WHITNEY
call GetTrainerPalettePointer
call LoadPalette_White_Col1_Col2_Black
ld a, MORTY
ld a, TOPAZ ;MORTY
call GetTrainerPalettePointer
call LoadPalette_White_Col1_Col2_Black
ld a, CHUCK
@ -644,14 +647,21 @@ _CGB_TrainerCard:
call GetPredefPal
call LoadHLPaletteIntoDE
; fill screen with opposite-gender palette for the card border
; fill screen with gender-based palette for the card border
hlcoord 0, 0, wAttrmap
ld bc, SCREEN_WIDTH * SCREEN_HEIGHT
ld a, [wPlayerGender]
and a
ld a, $1 ; kris
jr z, .got_gender
ld a, $0 ; chris
jr z, .male
dec a
jr z, .female
ld a, $6 ; dark magenta for enby
jr .got_gender
.male
ld a, $1 ; blue for chris
jr .got_gender
.female
ld a, $0 ; red for kris
.got_gender
call ByteFill
; fill trainer sprite area with same-gender palette
@ -659,14 +669,18 @@ _CGB_TrainerCard:
lb bc, 7, 5
ld a, [wPlayerGender]
and a
jr z, .male2
dec a
jr z, .female2
ld a, $4 ; enby
jr .got_gender2
.male2
ld a, $0 ; chris
jr z, .got_gender2
jr .got_gender2
.female2
ld a, $1 ; kris
.got_gender2
call FillBoxCGB
; top-right corner still uses the border's palette
hlcoord 18, 1, wAttrmap
ld [hl], $1
hlcoord 2, 11, wAttrmap
lb bc, 2, 4
ld a, $1 ; falkner
@ -695,22 +709,24 @@ _CGB_TrainerCard:
lb bc, 2, 4
ld a, $7 ; pryce
call FillBoxCGB
; clair uses kris's palette
ld a, [wPlayerGender]
and a
push af
jr z, .got_gender3
hlcoord 14, 14, wAttrmap
lb bc, 2, 4
ld a, $1
ld a, $1 ; clair
call FillBoxCGB
; top-right corner still uses the border's palette
ld a, [wPlayerGender]
and a
jr z, .male3
dec a
jr z, .female3
ld a, $6 ; dark magenta for enby
jr .got_gender3
.male3
ld a, $1 ; blue for chris
jr .got_gender3
.female3
ld a, $0 ; red for kris
.got_gender3
pop af
ld c, $0
jr nz, .got_gender4
inc c
.got_gender4
ld a, c
hlcoord 18, 1, wAttrmap
ld [hl], a
call ApplyAttrmap
@ -772,9 +788,15 @@ _CGB_PackPals:
jr z, .tutorial_male
ld a, [wPlayerGender]
bit PLAYERGENDER_FEMALE_F, a
and a ; MALE
jr z, .tutorial_male
dec a ; FEMALE
jr z, .tutorial_female
ld hl, .EnbyPackPals
jr .got_gender
.tutorial_female
ld hl, .KrisPackPals
jr .got_gender
@ -819,6 +841,9 @@ INCLUDE "gfx/pack/pack.pal"
.KrisPackPals:
INCLUDE "gfx/pack/pack_f.pal"
.EnbyPackPals:
INCLUDE "gfx/pack/pack_nb.pal"
_CGB_Pokepic:
call _CGB_MapPals
ld de, SCREEN_WIDTH

9
engine/gfx/color.asm
View file

@ -689,6 +689,12 @@ GetPlayerOrMonPalettePointer:
ld a, [wPlayerGender]
and a
jr z, .male
dec a
jr z, .female
ld hl, EnbyPalette
ret
.female
ld hl, KrisPalette
ret
@ -1332,6 +1338,9 @@ INCLUDE "gfx/pokegear/pokegear.pal"
FemalePokegearPals:
INCLUDE "gfx/pokegear/pokegear_f.pal"
EnbyPokegearPals:
INCLUDE "gfx/pokegear/pokegear_nb.pal"
BetaPokerPals:
INCLUDE "gfx/beta_poker/beta_poker.pal"

107
engine/gfx/player_gfx.asm
View file

@ -1,14 +1,14 @@
BetaLoadPlayerTrainerClass: ; unreferenced
ld c, CAL
ld a, [wPlayerGender]
bit PLAYERGENDER_FEMALE_F, a
jr z, .got_class
ld c, KAREN ; not KRIS?
.got_class
ld a, c
ld [wTrainerClass], a
ret
;BetaLoadPlayerTrainerClass: ; unreferenced
; ld c, CAL
; ld a, [wPlayerGender]
; bit PLAYERGENDER_FEMALE_F, a
; jr z, .got_class
; ld c, KAREN ; not KRIS?
;.got_class
; ld a, c
; ld [wTrainerClass], a
; ret
;
MovePlayerPicRight:
hlcoord 6, 4
ld de, 1
@ -57,9 +57,12 @@ MovePlayerPic:
ShowPlayerNamingChoices:
ld hl, ChrisNameMenuHeader
ld a, [wPlayerGender]
bit PLAYERGENDER_FEMALE_F, a
and a ; MALE
jr z, .got_header
ld hl, KrisNameMenuHeader
dec a ; FEMALE
jr z, .got_header
ld hl, EnbyNameMenuHeader
.got_header
call LoadMenuHeader
call VerticalMenu
@ -71,34 +74,45 @@ ShowPlayerNamingChoices:
INCLUDE "data/player_names.asm"
GetPlayerNameArray: ; unreferenced
ld hl, wPlayerName
ld de, MalePlayerNameArray
ld a, [wPlayerGender]
bit PLAYERGENDER_FEMALE_F, a
jr z, .got_array
ld de, FemalePlayerNameArray
.got_array
call InitName
ret
;GetPlayerNameArray: ; unreferenced
; ld hl, wPlayerName
; ld de, MalePlayerNameArray
; ld a, [wPlayerGender]
; bit PLAYERGENDER_FEMALE_F, a
; jr z, .got_array
; ld de, FemalePlayerNameArray
;.got_array
; call InitName
; ret
;
GetPlayerIcon:
ld de, ChrisSpriteGFX
ld b, BANK(ChrisSpriteGFX)
ld a, [wPlayerGender]
bit PLAYERGENDER_FEMALE_F, a
and a ; MALE
jr z, .got_gfx
; Female
ld de, KrisSpriteGFX
ld b, BANK(KrisSpriteGFX)
dec a ; FEMALE
jr z, .got_gfx
; Enby
ld de, EnbySpriteGFX
ld b, BANK(EnbySpriteGFX)
.got_gfx
ret
GetCardPic:
ld hl, ChrisCardPic
ld a, [wPlayerGender]
bit PLAYERGENDER_FEMALE_F, a
and a ; MALE
jr z, .got_pic
ld hl, KrisCardPic
dec a ; FEMALE
jr z, .got_pic
ld hl, EnbyCardPic
.got_pic
ld de, vTiles2 tile $00
ld bc, $23 tiles
@ -117,14 +131,19 @@ INCBIN "gfx/trainer_card/chris_card.2bpp"
KrisCardPic:
INCBIN "gfx/trainer_card/kris_card.2bpp"
EnbyCardPic:
INCBIN "gfx/trainer_card/enby_card.2bpp"
TrainerCardGFX:
INCBIN "gfx/trainer_card/trainer_card.2bpp"
GetPlayerBackpic:
ld a, [wPlayerGender]
bit PLAYERGENDER_FEMALE_F, a
and a ; MALE
jr z, GetChrisBackpic
call GetKrisBackpic
dec a ; FEMALE
jp z, GetKrisBackpic
call GetEnbyBackpic
ret
GetChrisBackpic:
@ -143,9 +162,12 @@ HOF_LoadTrainerFrontpic:
; Get class
ld e, CHRIS
ld a, [wPlayerGender]
bit PLAYERGENDER_FEMALE_F, a
and a ; MALE
jr z, .got_class
ld e, KRIS
dec a ; FEMALE
jr z, .got_class
ld e, TOPAZ
.got_class
ld a, e
ld [wTrainerClass], a
@ -153,9 +175,13 @@ HOF_LoadTrainerFrontpic:
; Load pic
ld de, ChrisPic
ld a, [wPlayerGender]
bit PLAYERGENDER_FEMALE_F, a
and a ; MALE
jr z, .got_pic
ld de, KrisPic
dec a ; FEMALE
jr z, .got_pic
ld de, EnbyPic
.got_pic
ld hl, vTiles2
ld b, BANK(ChrisPic) ; aka BANK(KrisPic)
@ -173,9 +199,12 @@ DrawIntroPlayerPic:
; Get class
ld e, CHRIS
ld a, [wPlayerGender]
bit PLAYERGENDER_FEMALE_F, a
and a ; MALE
jr z, .got_class
ld e, KRIS
dec a ; FEMALE
jr z, .got_class
ld e, TOPAZ
.got_class
ld a, e
ld [wTrainerClass], a
@ -183,9 +212,12 @@ DrawIntroPlayerPic:
; Load pic
ld de, ChrisPic
ld a, [wPlayerGender]
bit PLAYERGENDER_FEMALE_F, a
and a ; MALE
jr z, .got_pic
ld de, KrisPic
dec a ; FEMALE
jr z, .got_pic
ld de, EnbyPic
.got_pic
ld hl, vTiles2
ld b, BANK(ChrisPic) ; aka BANK(KrisPic)
@ -206,6 +238,9 @@ INCBIN "gfx/player/chris.2bpp"
KrisPic:
INCBIN "gfx/player/kris.2bpp"
EnbyPic:
INCBIN "gfx/player/enby.2bpp"
GetKrisBackpic:
; Kris's backpic is uncompressed.
ld de, KrisBackpic
@ -216,3 +251,13 @@ GetKrisBackpic:
KrisBackpic:
INCBIN "gfx/player/kris_back.2bpp"
GetEnbyBackpic:
ld de, EnbyBackpic
ld hl, vTiles2 tile $31
lb bc, BANK(EnbyBackpic), 7 * 7 ; dimensions
call Get2bpp
ret
EnbyBackpic:
INCBIN "gfx/player/enby_back.2bpp"