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

Aventurine City, Bank Split, Initial KEP Fuchsia Port

Browse source 
Had to split bank 2 because I ran out of unreferenced code to comment out when adding Aventurine

Fuchsia was pissing me off so I applied the changes from KEP when adding the safari zone graphics, though it's not currently super close to what it was like in LGPE

Aventurine is very early stages but it's in there :V
This commit is contained in:
Zeta_Null 2024-12-09 22:29:07 -05:00
parent 5e703191ce
commit 52a8f2cf20
32 changed files with 127 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
constants/engine_flags.asm
View file

@ -110,6 +110,7 @@
const ENGINE_FLYPOINT_SAVOY
const ENGINE_FLYPOINT_CORAL
const ENGINE_FLYPOINT_RUDDY
const ENGINE_FLYPOINT_AVENTURINE
const ENGINE_FLYPOINT_UNUSED
; wLuckyNumberShowFlag
const ENGINE_LUCKY_NUMBER_SHOW

1
constants/landmark_constants.asm
View file

@ -143,6 +143,7 @@ DEF NIHON_LANDMARK EQU const_value
const LANDMARK_ROUTE_52
const LANDMARK_RUDDY_TOWN
const LANDMARK_BLUE_FOREST
const LANDMARK_AVENTURINE_CITY
const LANDMARK_ROUTE_66
const LANDMARK_WHITE_CITY
DEF NUM_LANDMARKS EQU const_value

6
constants/map_constants.asm
View file

@ -687,7 +687,11 @@ ENDM
map_const BLUE_FOREST, 20, 18 ; 1
endgroup
newgroup WHITE_CITY ; 41
newgroup AVENTURINE_CITY ; 41
map_const AVENTURINE_CITY, 20, 18 ; 1
endgroup
newgroup WHITE_CITY ; 42
map_const WHITE_CITY, 30, 27 ; 1
map_const ROUTE_66_WHITE_CITY_GATE, 5, 4 ; 2
endgroup

2
constants/map_data_constants.asm
View file

@ -118,6 +118,7 @@ DEF NUM_FISHGROUPS EQU const_value - 1
const SPAWN_SAVOY_CITY
const SPAWN_CORAL_CITY
const SPAWN_RUDDY_TOWN
const SPAWN_AVENTURINE_CITY
DEF NUM_SPAWNS EQU const_value
DEF SPAWN_N_A EQU -1
@ -167,6 +168,7 @@ DEF NIHON_FLYPOINT EQU const_value
const FLY_SAVOY_CITY
const FLY_CORAL_CITY
const FLY_RUDDY_TOWN
const FLY_AVENTURINE_CITY
DEF NUM_FLYPOINTS EQU const_value
DEF MAX_OUTDOOR_SPRITES EQU 23 ; see engine/overworld/overworld.asm

2
constants/scgb_constants.asm
View file

@ -184,6 +184,8 @@ DEF SCGB_DEFAULT EQU $ff
const PREDEFPAL_GATES_NIHON_MORN
const PREDEFPAL_RUDDY_TOWN
const PREDEFPAL_RUDDY_TOWN_MORN
const PREDEFPAL_AVENTURINE
const PREDEFPAL_AVENTURINE_MORN
DEF NUM_PREDEF_PALS EQU const_value
; SGB system command codes

1
data/events/engine_flags.asm
View file

@ -120,6 +120,7 @@ EngineFlags:
engine_flag wVisitedSpawns, SPAWN_SAVOY_CITY
engine_flag wVisitedSpawns, SPAWN_CORAL_CITY
engine_flag wVisitedSpawns, SPAWN_RUDDY_TOWN
engine_flag wVisitedSpawns, SPAWN_AVENTURINE_CITY
engine_flag wVisitedSpawns, NUM_SPAWNS ; unused
engine_flag wLuckyNumberShowFlag, LUCKYNUMBERSHOW_GAME_OVER_F

2
data/maps/attributes.asm
View file

@ -908,6 +908,8 @@ ENDM
map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.
map_attributes AventurineCity, AVENTURINE_CITY, $05, 0 ; this is on its own for now. add connections later.
map_attributes WhiteCity, WHITE_CITY, $01, 0 ; this is on its own for now. add connections later.
map_attributes Route66WhiteCityGate, ROUTE_66_WHITE_CITY_GATE, $00, 0

3
data/maps/blocks.asm
View file

@ -1325,3 +1325,6 @@ Route52_Blocks:
RuddyTown_Blocks:
INCBIN "maps/RuddyTown.ablk"
AventurineCity_Blocks:
INCBIN "maps/AventurineCity.ablk"

1
data/maps/flypoints.asm
View file

@ -42,4 +42,5 @@ Flypoints:
db LANDMARK_SAVOY_CITY, SPAWN_SAVOY_CITY
db LANDMARK_CORAL_CITY, SPAWN_CORAL_CITY
db LANDMARK_RUDDY_TOWN, SPAWN_RUDDY_TOWN
db LANDMARK_AVENTURINE_CITY, SPAWN_AVENTURINE_CITY
db -1 ; end

2
data/maps/landmarks.asm
View file

@ -147,6 +147,7 @@ Landmarks:
landmark 12, 84, Route53Name
landmark 12, 68, RuddyTownName
landmark 140, 60, BlueForestName
landmark 140, 84, AventurineCityName
landmark 108, 108, Route66Name
landmark 124, 108, WhiteCityName
assert_table_length NUM_LANDMARKS
@ -279,4 +280,5 @@ SavoyCityName: db "SAVOY¯CITY@"
CoralCityName: db "CORAL¯CITY@"
RuddyTownName: db "RUDDY¯TOWN@"
BlueForestName: db "BLUE¯FOREST@"
AventurineCityName: db "AVENTURINE¯CITY@"
WhiteCityName: db "WHITE¯CITY@"

8
data/maps/maps.asm
View file

@ -57,7 +57,8 @@ MapGroupPointers::
dw MapGroup_CoralCity ; 38
dw MapGroup_RuddyTown ; 39
dw MapGroup_BlueForest ; 40
dw MapGroup_WhiteCity ; 41
dw MapGroup_Aventurine ; 41
dw MapGroup_WhiteCity ; 42
assert_table_length NUM_MAP_GROUPS
MapGroup_Olivine:
@ -754,6 +755,11 @@ MapGroup_BlueForest:
map BlueForest, TILESET_NIHON_SNOWY, TOWN, LANDMARK_BLUE_FOREST, MUSIC_SINJOH_RUINS, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
assert_table_length NUM_BLUE_FOREST_MAPS
MapGroup_Aventurine:
table_width MAP_LENGTH, MapGroup_Aventurine
map AventurineCity, TILESET_NIHON_01, TOWN, LANDMARK_AVENTURINE_CITY, MUSIC_MART, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
assert_table_length NUM_AVENTURINE_CITY_MAPS
MapGroup_WhiteCity:
table_width MAP_LENGTH, MapGroup_WhiteCity
map WhiteCity, TILESET_NIHON_WHITECITY, TOWN, LANDMARK_WHITE_CITY, MUSIC_VIRIDIAN_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

8
data/maps/outdoor_sprites.asm
View file

@ -44,6 +44,7 @@ OutdoorSprites:
dw CoralCityGroupSprites
dw RuddyTownGroupSprites
dw BlueForestGroupSprites
dw AventurineCityGroupSprites
dw WhiteCityGroupSprites
assert_table_length NUM_MAP_GROUPS
@ -332,9 +333,10 @@ IndigoGroupSprites:
db SPRITE_POKE_BALL
db SPRITE_BOULDER
BlueForestGroupSprites: ; Will have its own thing eventually
WhiteCityGroupSprites: ; Ditto
RuddyTownGroupSprites: ; Ditto
BlueForestGroupSprites: ; Will have its own thing eventually
AventurineCityGroupSprites: ; Ditto
WhiteCityGroupSprites: ; Ditto
RuddyTownGroupSprites: ; Ditto
NewBarkGroupSprites:
db SPRITE_SUICUNE
db SPRITE_SILVER_TROPHY

3
data/maps/roofs.asm
View file

@ -52,7 +52,8 @@ MapGroupRoofs:
db ROOF_NEW_BARK ; 38 (Coral City)
db ROOF_NEW_BARK ; 38 (Ruddy Town)
db ROOF_NEW_BARK ; 40 (Blue Forest)
db ROOF_NEW_BARK ; 41 (White City)
db ROOF_NEW_BARK ; 41 (Aventurine City)
db ROOF_NEW_BARK ; 42 (White City)
assert_table_length NUM_MAP_GROUPS + 1
Roofs:

3
data/maps/scripts.asm
View file

@ -638,4 +638,5 @@ INCLUDE "maps/Route50SavoyCityGate.asm"
INCLUDE "maps/CoralCity.asm"
INCLUDE "maps/Route51.asm"
INCLUDE "maps/Route52.asm"
INCLUDE "maps/RuddyTown.asm"
INCLUDE "maps/RuddyTown.asm"
INCLUDE "maps/AventurineCity.asm"

2
data/maps/sgb_roof_pal_inds.asm
View file

@ -44,6 +44,7 @@ MapGroupRoofSGBPalInds:
db PREDEFPAL_CORAL_CITY
db PREDEFPAL_RUDDY_TOWN
db PREDEFPAL_BLUE_FOREST
db PREDEFPAL_AVENTURINE
db PREDEFPAL_WHITE_CITY
assert_table_length NUM_MAP_GROUPS + 1
@ -91,5 +92,6 @@ MapGroupRoofSGBPalIndsMorn:
db PREDEFPAL_CORAL_CITY_MORN
db PREDEFPAL_RUDDY_TOWN_MORN
db PREDEFPAL_BLUE_FOREST_MORN
db PREDEFPAL_AVENTURINE_MORN
db PREDEFPAL_WHITE_CITY_MORN
assert_table_length NUM_MAP_GROUPS + 1

1
data/maps/spawn_points.asm
View file

@ -52,6 +52,7 @@ SpawnPoints:
spawn SAVOY_CITY, 25, 15
spawn CORAL_CITY, 31, 11
spawn RUDDY_TOWN, 31, 15
spawn AVENTURINE_CITY, 33, 21
spawn N_A, -1, -1

BIN
data/tilesets/kanto_attributes.bin
View file

Binary file not shown.

5
data/tilesets/kanto_collision.asm
View file

@ -182,3 +182,8 @@
tilecoll WATER, WATER, WATER, WATER ; b5
tilecoll WATER, WATER, WATER, WATER ; b6
tilecoll WATER, WATER, WATER, WATER ; b7
tilecoll WALL, WALL, DOOR, WALL ; b8
tilecoll WALL, WALL, WALL, WALL ; b9
tilecoll WALL, WALL, WALL, WATER ; ba
tilecoll WALL, WALL, WATER, WALL ; bb
tilecoll WALL, HOP_DOWN_LEFT, WALL, WALL ; bc

BIN
data/tilesets/kanto_metatiles.bin
View file

Binary file not shown.

BIN
data/tilesets/nihon01_attributes.bin
View file

Binary file not shown.

20
data/tilesets/nihon01_collision.asm
View file

@ -142,3 +142,23 @@
tilecoll WARP_CARPET_UP, WARP_CARPET_UP, FLOOR, FLOOR ; 8d
tilecoll WALL, WALL, WALL, WALL ; 8e
tilecoll WALL, WALL, WALL, WALL ; 8f
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 90
tilecoll WALL, WALL, FLOOR, FLOOR ; 91
tilecoll WALL, WALL, DOOR, WALL ; 92
tilecoll WALL, WALL, FLOOR, FLOOR ; 93
tilecoll WALL, WALL, WALL, WALL ; 94
tilecoll WALL, WALL, DOOR, WALL ; 95
tilecoll WALL, WALL, FLOOR, FLOOR ; 96
tilecoll WALL, WALL, DOOR, DOOR ; 97
tilecoll WALL, WALL, WALL, WALL ; 98
tilecoll WALL, WALL, WALL, WALL ; 99
tilecoll WALL, WALL, WALL, WALL ; 9a
tilecoll WALL, WALL, WALL, WALL ; 9b
tilecoll WALL, WALL, WALL, DOOR ; 9c
tilecoll WALL, WALL, WALL, WALL ; 9d
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 9e
tilecoll FLOOR, FLOOR, WALL, WALL ; 9f
tilecoll WALL, WALL, WALL, WALL ; a0
tilecoll WALL, WALL, WALL, WALL ; a1
tilecoll WALL, WALL, WALL, WALL ; a2
tilecoll WALL, WALL, DOOR, WALL ; a3

BIN
data/tilesets/nihon01_metatiles.bin
View file

Binary file not shown.

4
gfx/sgb/predef.pal
View file

@ -135,4 +135,6 @@
RGB 31,31,31, 21,21,16, 12,15,20, 00,00,00 ; PREDEFPAL_ROUTES_NIHON_MORN
RGB 31,31,31, 16,16,16, 12,15,20, 00,00,00 ; PREDEFPAL_GATES_NIHON_MORN
RGB 31,31,31, 26,10,06, 15,20,20, 00,00,00 ; PREDEFPAL_RUDDY_TOWN
RGB 31,31,31, 23,09,04, 12,15,20, 00,00,00 ; PREDEFPAL_RUDDY_TOWN_MORN #
RGB 31,31,31, 23,09,04, 12,15,20, 00,00,00 ; PREDEFPAL_RUDDY_TOWN_MORN #
RGB 31,31,31, 03,29,11, 15,20,20, 00,00,00 ; PREDEFPAL_AVENTURINE
RGB 31,31,31, 08,25,12, 12,15,20, 00,00,00 ; PREDEFPAL_AVENTURINE_MORN

BIN
gfx/tilesets/kanto.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

BIN
gfx/tilesets/nihon01.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.6 KiB

6
gfx/tilesets/roofs.pal
View file

@ -155,6 +155,10 @@
RGB 24,22,31, 18,14,31 ; morn/day
RGB 12,10,24, 08,03,23 ; nite
; group 33 (White City)
; group 33 (Aventurine City)
RGB 03,28,14, 06,20,11 ; morn/day
RGB 01,14,14, 00,03,10 ; nite
; group 34 (White City)
RGB 27,28,31, 24,24,26 ; morn/day
RGB 13,12,24, 11,09,22 ; nite

4
main.asm
View file

@ -19,6 +19,10 @@ SECTION "bank2", ROMX
INCLUDE "engine/overworld/player_object.asm"
INCLUDE "engine/math/sine.asm"
SECTION "bank2.5", ROMX
INCLUDE "engine/predef.asm"
INCLUDE "engine/gfx/color.asm"

1
maps/AventurineCity.ablk Normal file
View file

@ -0,0 +1 @@
wxy<05><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>wxy<05>CC<>wxy<05>"?"?<3F>@AAwxy<05><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>Dwxy<02><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"wxy<02><>C<><43><EFBFBD><EFBFBD>9<EFBFBD>q<EFBFBD><05><><EFBFBD><EFBFBD><EFBFBD><EFBFBD>"?<3F><><EFBFBD>?<02><><EFBFBD>□■<E296A1><E296A0><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><05><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>@AAB<41><42><EFBFBD><EFBFBD>.<2E><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><1B>DTUF<55><46><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>?<02><><05>99<39>99@AAAAA<02><><02><><EFBFBD><1A> !<02><><EFBFBD><EFBFBD><EFBFBD><1F><05><1E><02><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><02><02><><EFBFBD><EFBFBD><05><><EFBFBD>e

25
maps/AventurineCity.asm Normal file
View file

@ -0,0 +1,25 @@
object_const_def
AventurineCity_MapScripts:
def_scene_scripts
def_callbacks
callback MAPCALLBACK_NEWMAP, .Flypoint
.Flypoint:
setflag ENGINE_FLYPOINT_AVENTURINE
return
AventurineCity_MapEvents:
db 0, 0 ; filler
def_warp_events
warp_event 30, 13, DEBUG_ROOM, 1
warp_event 31, 13, DEBUG_ROOM, 1
def_coord_events
def_bg_events
def_object_events

2
maps/DebugRoom.asm
View file

@ -401,7 +401,7 @@ DebugRoom_MapEvents:
warp_event 15, 2, GOLDENROD_CITY, 1 ; city warp
warp_event 4, 9, SUMMER_BEACH_HOUSE, 1 ; left lab/league warp
warp_event 5, 9, BLUE_FOREST, 1 ; right lab/league warp
warp_event 35, 17, OLD_CITY, 1 ; east warp
warp_event 35, 17, AVENTURINE_CITY, 1 ; east warp
warp_event 5, 35, LAVENDER_TOWN, 1 ; southwest warp
warp_event 19, 34, KANTO_SAFARI_ZONE_CENTER, 1 ; southern warp
warp_event 33, 33, FOUR_ISLAND, 1 ; southeast warp

36
maps/FuchsiaCity.ablk
View file

@ -1,25 +1,27 @@
･･･
¥¥¥ T!¥¥¥¥¥¥¥¥¥¥
©©©¥¥¥7€~¥¥tttt¥¥¥¥¦¥¥t¤VUw¥
t
¥¥¥<EFBFBD>¹Ž¥¥¥¥¥¥¥¥¥¥
©©©¥¥¥7¸~t©©©©©©t¥¥¦¥tt¤VUw¦{1¥{1¤¥¥¦wV¥wV¤{{{¦wV¥wwV¤¥¥t{{{{{{{{{{{{{{{{
¥¥tttt
{º»{ T!{¦¡¡¡¤¥¥tttt
{{7:~{¦wVw¤¥¥
©©©©y{{{1U1{{{{{
¥¥
g¥<>Ž
VUV©©©©tt¥¡
kkk|sO1U1wwww11¥_t1
ttt
¢¥¥¥¦wt¥ttt{©©wwwwwww¥¥¥ttt{ttt¦{{
tt_t
7¥ tttt<74>Ž_ T!1¦¥¥0|r_7:~1¦¥¥¼\K
_Vw1w¦¥¥1{{11
t
¥¥t<EFBFBD>Ž©©©©­{ T!t¡¡tt
¥¥t|s{{{
7:~©wtt©
¥¥©©©©©y{{¦VUV¤tt¦¥¥¥¥¥g¤
¦U¡¡¡¡¡¡¥¡¡kkkPRR­Uwwww11¥U_t1
>?????????;_t
7N$ WWWW<57>Ž%_89¦¥NX0|rY1<=01¦¥NX11111111Y_Vw1w¦¥NZ\©©\©©©[11¦¥PRR¡t>?;RRRRRRRR¦¥>?;FJ11(,)¥¥¥¥¥¥¥¥¥¥
11¦¥¥ttt>?;RRRRRRRR¦¥>?;FJtt(,)¥¥¥¥¥¥¥¥¥¥

10
maps/FuchsiaCity.asm
View file

@ -118,12 +118,12 @@ FuchsiaCity_MapEvents:
db 0, 0 ; filler
def_warp_events
warp_event 5, 13, FUCHSIA_MART, 2
warp_event 15, 19, FUCHSIA_MART, 2
warp_event 22, 13, SAFARI_ZONE_MAIN_OFFICE, 1
warp_event 8, 27, FUCHSIA_GYM, 1
warp_event 11, 27, BILLS_BROTHERS_HOUSE, 1
warp_event 19, 27, FUCHSIA_POKECENTER_1F, 1
warp_event 27, 27, SAFARI_ZONE_WARDENS_HOME, 1
warp_event 28, 27, SAFARI_ZONE_WARDENS_HOME, 1
warp_event 18, 3, SAFARI_ZONE_FUCHSIA_GATE_BETA, 3
warp_event 37, 22, ROUTE_15_FUCHSIA_GATE, 1
warp_event 37, 23, ROUTE_15_FUCHSIA_GATE, 2
@ -133,14 +133,14 @@ FuchsiaCity_MapEvents:
def_coord_events
def_bg_events
bg_event 21, 15, BGEVENT_READ, FuchsiaCitySign
bg_event 21, 17, BGEVENT_READ, FuchsiaCitySign
bg_event 5, 29, BGEVENT_READ, FuchsiaGymSign
bg_event 25, 15, BGEVENT_READ, SafariZoneOfficeSign
bg_event 25, 17, BGEVENT_READ, SafariZoneOfficeSign
bg_event 27, 29, BGEVENT_READ, WardensHomeSign
bg_event 17, 5, BGEVENT_READ, SafariZoneClosedSign
bg_event 13, 15, BGEVENT_READ, NoLitteringSign
bg_event 20, 27, BGEVENT_READ, FuchsiaCityPokecenterSign
bg_event 6, 13, BGEVENT_READ, FuchsiaCityMartSign
bg_event 16, 19, BGEVENT_READ, FuchsiaCityMartSign
def_object_events
object_event 23, 18, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 1, 1, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, FuchsiaCityYoungster, -1