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

2
data/events/engine_flags.asm
View file

@ -128,8 +128,6 @@ EngineFlags:
engine_flag wGameTimerPaused, GAME_TIMER_MOBILE_F
engine_flag wPlayerGender, PLAYERGENDER_FEMALE_F
engine_flag wCelebiEvent, CELEBIEVENT_FOREST_IS_RESTLESS_F
; rematches

28
data/player_names.asm
View file

@ -10,10 +10,10 @@ ChrisNameMenuHeader:
db 5 ; items
db "NEW NAME@"
MalePlayerNameArray:
db "ETHAN@"
db "GOLD@"
db "CHRIS@"
db "MAT@"
db "ALLAN@"
db "JON@"
db "JIMMY@"
db 2 ; title indent
db " NAME @" ; title
@ -30,8 +30,28 @@ KrisNameMenuHeader:
db "NEW NAME@"
FemalePlayerNameArray:
db "KRIS@"
db "MARINA@"
db "AMANDA@"
db "JUANA@"
db "JODI@"
db 2 ; title indent
db " NAME @" ; title
EnbyNameMenuHeader:
db MENU_BACKUP_TILES ; flags
menu_coords 0, 0, 10, TEXTBOX_Y - 1
dw .OtherNames
db 1 ; ????
db 0 ; default option
.OtherNames:
db STATICMENU_CURSOR | STATICMENU_PLACE_TITLE | STATICMENU_DISABLE_B ; flags
db 5 ; items
db "NEW NAME@"
EnbyPlayerNameArray:
db "TOPAZ@"
db "SAM@"
db "CRYS@"
db "RAY@"
db 2 ; displacement
db " NAME @" ; title

16
data/sprite_anims/framesets.asm
View file

@ -67,6 +67,8 @@ SpriteAnimFrameData:
dw .Frameset_IntroUnownF
dw .Frameset_CelebiLeft
dw .Frameset_CelebiRight
dw .Frameset_PurpleWalk
dw .Frameset_MagnetTrainPurple
assert_table_length NUM_SPRITE_ANIM_FRAMESETS
.Frameset_00:
@ -497,3 +499,17 @@ SpriteAnimFrameData:
oamframe SPRITE_ANIM_OAMSET_CELEBI_1, 8, OAM_X_FLIP
oamframe SPRITE_ANIM_OAMSET_CELEBI_2, 8, OAM_X_FLIP
oamend
.Frameset_PurpleWalk:
oamframe SPRITE_ANIM_OAMSET_PURPLE_WALK_1, 8
oamframe SPRITE_ANIM_OAMSET_PURPLE_WALK_2, 8
oamframe SPRITE_ANIM_OAMSET_PURPLE_WALK_1, 8
oamframe SPRITE_ANIM_OAMSET_PURPLE_WALK_2, 8, OAM_X_FLIP
oamrestart
.Frameset_MagnetTrainPurple:
oamframe SPRITE_ANIM_OAMSET_MAGNET_TRAIN_PURPLE_1, 8
oamframe SPRITE_ANIM_OAMSET_MAGNET_TRAIN_PURPLE_2, 8
oamframe SPRITE_ANIM_OAMSET_MAGNET_TRAIN_PURPLE_1, 8
oamframe SPRITE_ANIM_OAMSET_MAGNET_TRAIN_PURPLE_2, 8, OAM_X_FLIP
oamrestart

18
data/sprite_anims/oam.asm
View file

@ -147,6 +147,10 @@ SpriteAnimOAMData:
spriteanimoam $08, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_9
spriteanimoam $04, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_10
spriteanimoam $00, .OAMData_GameFreakLogo4_11 ; SPRITE_ANIM_OAMSET_GAMEFREAK_LOGO_11
spriteanimoam $00, .OAMData_PurpleWalk ; SPRITE_ANIM_OAMSET_PURPLE_WALK_1
spriteanimoam $04, .OAMData_PurpleWalk ; SPRITE_ANIM_OAMSET_PURPLE_WALK_2
spriteanimoam $00, .OAMData_MagnetTrainPurple ; SPRITE_ANIM_OAMSET_MAGNET_TRAIN_PURPLE_1
spriteanimoam $04, .OAMData_MagnetTrainPurple ; SPRITE_ANIM_OAMSET_MAGNET_TRAIN_PURPLE_2
assert_table_length NUM_SPRITE_ANIM_OAMSETS
.OAMData_1x1_Palette0:
@ -1133,3 +1137,17 @@ SpriteAnimOAMData:
dbsprite -1, 0, 4, 0, $51, 1
dbsprite 0, 0, 4, 0, $52, 1
dbsprite 1, 0, 4, 0, $53, 1
.OAMData_PurpleWalk:
db 4
dbsprite -1, 0, -1, 0, $00, PAL_OW_PURPLE
dbsprite -1, 0, 0, 0, $01, PAL_OW_PURPLE
dbsprite 0, 0, -1, 0, $02, PAL_OW_PURPLE
dbsprite 0, 0, 0, 0, $03, PAL_OW_PURPLE
.OAMData_MagnetTrainPurple:
db 4
dbsprite -1, 0, -1, 0, $00, PAL_OW_PURPLE | PRIORITY
dbsprite -1, 0, 0, 0, $01, PAL_OW_PURPLE | PRIORITY
dbsprite 0, 0, -1, 0, $02, PAL_OW_PURPLE | PRIORITY
dbsprite 0, 0, 0, 0, $03, PAL_OW_PURPLE | PRIORITY

4
data/sprite_anims/sequences.asm
View file

@ -92,4 +92,8 @@ SpriteAnimSeqData:
db SPRITE_ANIM_FRAMESET_INTRO_SUICUNE_AWAY, SPRITE_ANIM_SEQ_INTRO_SUICUNE_AWAY, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_CELEBI
db SPRITE_ANIM_FRAMESET_CELEBI_LEFT, SPRITE_ANIM_SEQ_NULL, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_PURPLE_WALK
db SPRITE_ANIM_FRAMESET_PURPLE_WALK, SPRITE_ANIM_SEQ_NULL, SPRITE_ANIM_DICT_DEFAULT
; SPRITE_ANIM_INDEX_MAGNET_TRAIN_PURPLE
db SPRITE_ANIM_FRAMESET_MAGNET_TRAIN_PURPLE, SPRITE_ANIM_SEQ_NULL, SPRITE_ANIM_DICT_DEFAULT
assert_table_length NUM_SPRITE_ANIM_INDEXES

8
data/sprites/player_sprites.asm
View file

@ -11,3 +11,11 @@ KrisStateSprites:
db PLAYER_SURF, SPRITE_SURF
db PLAYER_SURF_PIKA, SPRITE_SURFING_PIKACHU
db -1 ; end
EnbyStateSprites:
db PLAYER_NORMAL, SPRITE_ENBY
db PLAYER_BIKE, SPRITE_ENBY_BIKE
db PLAYER_SURF, SPRITE_SURF
db PLAYER_SURF_PIKA, SPRITE_SURFING_PIKACHU
db -1 ; end

2
data/sprites/sprites.asm
View file

@ -109,4 +109,6 @@ OverworldSprites:
overworld_sprite EnteiSpriteGFX, 4, STILL_SPRITE, PAL_OW_RED
overworld_sprite RaikouSpriteGFX, 4, STILL_SPRITE, PAL_OW_RED
overworld_sprite StandingYoungsterSpriteGFX, 12, STANDING_SPRITE, PAL_OW_BLUE
overworld_sprite EnbySpriteGFX, 12, WALKING_SPRITE, PAL_OW_PURPLE
overworld_sprite EnbyBikeSpriteGFX, 12, WALKING_SPRITE, PAL_OW_PURPLE
assert_table_length NUM_OVERWORLD_SPRITES

4
data/text/common_2.asm
View file

@ -663,8 +663,8 @@ _YouCantUseItInABattleText::
prompt
_AreYouABoyOrAreYouAGirlText::
text "Are you a boy?"
line "Or are you a girl?"
text "Please choose your"
line "gender."
done
Text_BattleEffectActivate::

6
data/trainers/palettes.asm
View file

@ -12,6 +12,7 @@ KrisPalette: ; Kris shares Falkner's palette
INCBIN "gfx/trainers/falkner.gbcpal", middle_colors
INCBIN "gfx/trainers/whitney.gbcpal", middle_colors
INCBIN "gfx/trainers/bugsy.gbcpal", middle_colors
;EnbyPalette:
INCBIN "gfx/trainers/morty.gbcpal", middle_colors
INCBIN "gfx/trainers/pryce.gbcpal", middle_colors
INCBIN "gfx/trainers/jasmine.gbcpal", middle_colors
@ -77,4 +78,7 @@ INCBIN "gfx/trainers/officer.gbcpal", middle_colors
INCBIN "gfx/trainers/grunt_f.gbcpal", middle_colors
INCBIN "gfx/trainers/mysticalman.gbcpal", middle_colors
assert_table_length NUM_TRAINER_CLASSES + 1
EnbyPalette:
INCLUDE "gfx/player/topaz.pal"
assert_table_length NUM_TRAINER_CLASSES + 2