thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2025-09-16 18:20:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ZetaNull/jep-hack

Browse source
This commit is contained in:
Martha Schilling 2024-07-21 22:48:33 +01:00
parent 12928cfc81 869986db26
commit fe1911b5c8
15 changed files with 129 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
README.md
View file

@ -97,7 +97,8 @@ Additionally, there have been many wild encounter tweaks. View this document for
# Sprite Credits
- Zeta_Null: Topaz sprites, numerous tileset bits, Omegadge, Qatu, Phandarin, Stromen, Lickilord,
- Martha's Against Humanity: Shi-Shi, Fossil Aerodactyl, Fossil Kabutops
- nuuk: (WIP) Azurill, Electivire, Farigiraf, Glaceon, Honchkrow, Leafeon, Magmortar, Magnezone, Porygon-Z, Sylveon, Togekiss, Wyrdeer
- zuperZACH: Clodsire (front), Mismagius, Alolan Vulpix
- nuuk: (WIP) Azurill, Electivire, Farigiraf, Glaceon, Honchkrow, Leafeon, Magmortar, Magnezone, Porygon-Z, Sylveon, Togekiss, Wyrdeer, Clodsire (back)
- Scarlax, Pix, BloodlessNX, Kam, Poket, BimbelyGimbly - Animated sprites from [Pokemon October](https://github.com/pokeachromicdevs/pokeoctober): Bellignan, Caretorker (Adbarstork), Inoshika (Aggroswine), Bipulla, Sonegg (Clefling), Kolta (Coalta), Coinpur, Dodaerie, Bundra (Germifrost), Kiwooked (Kiwacki), Eucala (Koalyptus), Trebir, Burgela, Gorotora, Moibelle, Molambino, Dokuroar (Necrorex), Orfry, Blossomole (Petamole), Smujj
- SoupPotato et al - Various sprites from [Pokemon Gold & Silver '97 Reforged](https://github.com/SoupPotato/gold97); Palssio (Cruize), Pressio (Aquallo) Donmarin (Aquarius), Grenmar (Bombsheal, with edits), Jungela (Gelania), Elebebi (Elebabe), Mimmeo (Metto), Kazappelin (Numbpuff), Disturban (Turban), Angore (Anchorage)
- SCMidna: Munchlax

2
data/tilesets/nihon_snowy_collision.asm
View file

@ -11,7 +11,7 @@
tilecoll WALL, WALL, WALL, WALL ; 0a
tilecoll WALL, WALL, WALL, WALL ; 0b
tilecoll WALL, DOOR, FLOOR, FLOOR ; 0c
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0d
tilecoll WALL, WALL, FLOOR, FLOOR ; 0d
tilecoll WALL, WALL, WALL, DOOR ; 0e
tilecoll WALL, WALL, WALL, WALL ; 0f
tilecoll WALL, WALL, WALL, WALL ; 10

4
engine/battle/battle_transition.asm
View file

@ -645,8 +645,8 @@ StartTrainerBattle_LoadPokeBallGraphics:
dec b
jr nz, .tile_loop
ldh a, [hCGB]
and a
ld a, [wOptions2]
and 1 << MENU_ACCOUNT
jr nz, .cgb
ld a, 1
ldh [hBGMapMode], a

3
engine/events/heal_machine_anim.asm
View file

@ -155,7 +155,8 @@ INCBIN "gfx/overworld/heal_machine.2bpp"
dbsprite 11, 7, 5, 1, $7d, PAL_OW_TREE | OBP_NUM
.LoadPalettes:
call IsCGB
ld a, [wOptions2]
and 1 << MENU_ACCOUNT
jr nz, .cgb
ld a, %11100000
ldh [rOBP1], a

86
engine/gfx/cgb_layouts.asm
View file

@ -531,10 +531,94 @@ _CGB_Diploma:
ret
_CGB_MapPals:
ld a, [wOptions2]
and 1 << MENU_ACCOUNT
jr z, .SGBmode
ld a, [wOptions2]
and 1 << MENU_ACCOUNT
jr nz, .GBCmode
ret
.GBCmode:
call LoadMapPals
ld a, SCGB_MAPPALS
ld [wDefaultSGBLayout], a
ret
.SGBmode:
; Get SGB palette
call SGBLayoutJumptable.GetMapPalsIndex
call GetPredefPal
ld de, wBGPals1
; Copy 7 BG palettes
ld b, 7
.bg_loop
call .LoadHLBGPaletteIntoDE
dec b
jr nz, .bg_loop
; Copy PAL_BG_TEXT and 6 OB palettes
ld b, 7
.ob_loop
call .LoadHLOBPaletteIntoDE
dec b
jr nz, .ob_loop
; Copy PAL_OW_TREE and PAL_OW_ROCK
call .LoadHLBGPaletteIntoDE
call .LoadHLBGPaletteIntoDE
ld a, SCGB_MAPPALS
ld [wDefaultSGBLayout], a
ret
.LoadHLBGPaletteIntoDE:
; morn/day: shades 0, 1, 2, 3 -> 0, 1, 2, 3
; nite: shades 0, 1, 2, 3 -> 1, 2, 2, 3
push hl
ld a, [wTimeOfDayPal]
cp NITE_F
jr c, .bg_morn_day
inc hl
inc hl
call .LoadHLColorIntoDE
call .LoadHLColorIntoDE
dec hl
dec hl
call .LoadHLColorIntoDE
call .LoadHLColorIntoDE
.bg_done
pop hl
ret
.bg_morn_day
call LoadHLPaletteIntoDE
jr .bg_done
.LoadHLOBPaletteIntoDE:
; shades 0, 1, 2, 3 -> 0, 0, 1, 3
push hl
call .LoadHLColorIntoDE
dec hl
dec hl
call .LoadHLColorIntoDE
call .LoadHLColorIntoDE
inc hl
inc hl
call .LoadHLColorIntoDE
pop hl
ret
.LoadHLColorIntoDE:
ldh a, [rSVBK]
push af
ld a, BANK(wBGPals1)
ldh [rSVBK], a
rept PAL_COLOR_SIZE
ld a, [hli]
ld [de], a
inc de
endr
pop af
ldh [rSVBK], a
ret
_CGB_PartyMenu:
ld hl, PalPacket_PartyMenu + 1
@ -627,6 +711,8 @@ _CGB_UnownPuzzle:
ret
_CGB_TrainerCard:
ld a, [wOptions2]
and 1 << MENU_ACCOUNT
ld de, wBGPals1
xor a ; CHRIS
call GetTrainerPalettePointer

2
engine/menus/options_menu.asm
View file

@ -85,7 +85,7 @@ StringOptions:
db " :<LF>"
db "PRINT<LF>"
db " :<LF>"
db "MENU ACCOUNT<LF>"
db "GBC COLORS<LF>"
db " :<LF>"
db "FRAME<LF>"
db " :TYPE<LF>"

4
engine/menus/start_menu.asm
View file

@ -381,8 +381,8 @@ endr
jp TextboxPalette
.IsMenuAccountOn:
ld a, [wOptions2]
and 1 << MENU_ACCOUNT
; ld a, [wOptions2]
; and 1 << MENU_ACCOUNT
ret
.DrawBugContestStatusBox:

13
engine/tilesets/tileset_anims.asm
View file

@ -718,8 +718,8 @@ AnimateFlowerTile:
; CGB has different tile graphics for flowers
ld e, a
ldh a, [hCGB]
and 1
ld a, [wOptions2]
and 1 << MENU_ACCOUNT
add e
; hl = .FlowerTileFrames + a * 16
@ -739,6 +739,7 @@ AnimateFlowerTile:
INCBIN "gfx/tilesets/flower/cgb_1.2bpp"
INCBIN "gfx/tilesets/flower/dmg_2.2bpp"
INCBIN "gfx/tilesets/flower/cgb_2.2bpp"
AnimateLavaBubbleTile1:
; Save the stack pointer in bc for WriteTile to restore
@ -951,8 +952,8 @@ AnimateWaterPalette:
; Transition between color values 0-2 for color 0 in palette 3.
; Don't update the palette on DMG
ldh a, [hCGB]
and a
ld a, [wOptions2]
and 1 << MENU_ACCOUNT
ret z
; Don't update a non-standard palette order
@ -1014,8 +1015,8 @@ AnimateWaterPalette:
FlickeringCaveEntrancePalette:
; Don't update the palette on DMG
ldh a, [hCGB]
and a
ld a, [wOptions2]
and 1 << MENU_ACCOUNT
ret z
; Don't update a non-standard palette order

11
gfx/pokemon/vulpixalola/anim.asm Normal file
View file

@ -0,0 +1,11 @@
frame 0, 08
frame 1, 10
frame 2, 04
frame 3, 04
frame 2, 04
frame 3, 04
frame 2, 04
frame 3, 04
frame 2, 05
frame 0, 16
endanim

10
gfx/pokemon/vulpixalola/anim_idle.asm Normal file
View file

@ -0,0 +1,10 @@
frame 4, 02
frame 5, 02
frame 4, 02
frame 5, 02
frame 4, 02
frame 5, 02
frame 4, 02
frame 5, 02
frame 0, 16
endanim

BIN
gfx/pokemon/vulpixalola/back.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 948 B

BIN
gfx/pokemon/vulpixalola/front.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 4.6 KiB

2
gfx/pokemon/vulpixalola/shiny.pal Normal file
View file

@ -0,0 +1,2 @@
RGB 25, 23, 29
RGB 16, 10, 21

2
gfx/sgb/predef.pal
View file

@ -23,7 +23,6 @@
RGB 31,31,31, 31,20,20, 15,20,31, 00,00,00 ; PREDEFPAL_LAKE_OF_RAGE
RGB 31,31,31, 26,26,26, 15,20,31, 00,00,00 ; PREDEFPAL_SILVER_CAVE
RGB 31,31,31, 21,14,09, 15,20,20, 00,00,00 ; PREDEFPAL_DUNGEONS
RGB 31,31,31, 12,28,22, 15,20,20, 00,00,00 ; PREDEFPAL_SILENT_HILLS
RGB 31,31,31, 29,26,18, 15,20,31, 00,00,00 ; PREDEFPAL_CITRINE (temp)
RGB 31,31,31, 29,26,18, 15,20,31, 00,00,00 ; PREDEFPAL_ONE_ISLAND (temp)
RGB 31,31,31, 29,26,18, 15,20,31, 00,00,00 ; PREDEFPAL_TWO_ISLAND (temp)
@ -32,6 +31,7 @@
RGB 31,31,31, 29,26,18, 15,20,31, 00,00,00 ; PREDEFPAL_FIVE_ISLAND (temp)
RGB 31,31,31, 29,26,18, 15,20,31, 00,00,00 ; PREDEFPAL_SIX_ISLAND (temp)
RGB 31,31,31, 29,26,18, 15,20,31, 00,00,00 ; PREDEFPAL_SEVEN_ISLAND (temp)
RGB 31,31,31, 12,28,22, 15,20,20, 00,00,00 ; PREDEFPAL_SILENT_HILLS
RGB 31,31,31, 18,14,31, 15,20,20, 00,00,00 ; PREDEFPAL_BLUE_FOREST
RGB 31,31,31, 12,28,22, 15,20,20, 00,00,00 ; PREDEFPAL_NITE
RGB 31,31,31, 07,07,07, 02,03,03, 00,00,00 ; PREDEFPAL_BLACKOUT

4
maps/DebugRoom.asm
View file

@ -57,11 +57,11 @@ DebugPokemon4Script:
faceplayer
opentext
writetext DebugTextB
cry DOKUROAR
cry NIDORAN_M
pause 15
closetext
loadvar VAR_BATTLETYPE, BATTLETYPE_NORMAL
loadwildmon DOKUROAR, 60
loadwildmon BIPULLA, 60
startbattle
reloadmapafterbattle
end