thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2025-10-15 19:54:28 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Three Island and properly implement nihon region check for the trainer battle theme (double check this doesnt accidentally also effect sevii)

Browse source
This commit is contained in:
Zeta_Null 2024-10-12 17:52:52 -04:00
parent 59787cbecb
commit 8b9927bc6f
12 changed files with 30 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
constants/map_constants.asm
View file

@ -577,8 +577,8 @@ ENDM
endgroup
newgroup THREE_ISLAND ; 30
map_const THREE_ISLAND_PORT, 10, 10 ; 1
map_const THREE_ISLAND, 10, 10 ; 2
map_const THREE_ISLAND_PORT, 20, 9 ; 1
map_const THREE_ISLAND, 10, 18 ; 2
map_const BOND_BRIDGE, 10, 10 ; 3
map_const BERRY_FOREST, 17, 15 ; 4
endgroup

6
data/maps/attributes.asm
View file

@ -771,8 +771,10 @@ ENDM
map_attributes TwoIsland, TWO_ISLAND, $00, 0 ; Bank 2
map_attributes CapeBrink, CAPE_BRINK, $00, 0 ; Bank 2
map_attributes ThreeIslandPort, THREE_ISLAND_PORT, $00, 0 ; Bank 2
map_attributes ThreeIsland, THREE_ISLAND, $00, 0 ; Bank 3
map_attributes ThreeIslandPort, THREE_ISLAND_PORT, $02, NORTH ; Bank 2
connection north, ThreeIsland, THREE_ISLAND, 0
map_attributes ThreeIsland, THREE_ISLAND, $03, SOUTH ; Bank 3
connection south, ThreeIslandPort, THREE_ISLAND_PORT, 0
map_attributes BondBridge, BOND_BRIDGE, $00, 0 ; Bank 3
map_attributes BerryForest, BERRY_FOREST, $00, 0 ; Bank 3

4
data/maps/blocks.asm
View file

@ -1206,6 +1206,8 @@ AlteringCave_Blocks:
ThreeIslandPort_Blocks:
INCBIN "maps/ThreeIslandPort.ablk"
SECTION "Map Blocks 4", ROMX
SinjohRuinsExterior_Blocks:
INCBIN "maps/SinjohRuinsExterior.ablk"
@ -1239,8 +1241,6 @@ HoneyGrandmasHouse_Blocks:
SepiaSchool_Blocks:
INCBIN "maps/SepiaSchool.ablk"
SECTION "Map Blocks 4", ROMX
WhiteCity_Blocks:
INCBIN "maps/WhiteCity.ablk"

6
data/maps/maps.asm
View file

@ -631,9 +631,9 @@ MapGroup_TwoIsland: ; 29
MapGroup_ThreeIsland: ; 30
table_width MAP_LENGTH, MapGroup_ThreeIsland
map ThreeIslandPort, TILESET_GATE, GATE, LANDMARK_THREE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map ThreeIsland, TILESET_CAVE, TOWN, LANDMARK_THREE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map BondBridge, TILESET_CAVE, ROUTE, LANDMARK_THREE_ISLAND, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map ThreeIslandPort, TILESET_SEVII, ROUTE, LANDMARK_THREE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_DAY, FISHGROUP_SHORE
map ThreeIsland, TILESET_SEVII, TOWN, LANDMARK_THREE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map BondBridge, TILESET_SEVII, ROUTE, LANDMARK_THREE_ISLAND, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
map BerryForest, TILESET_FOREST_KANTO, CAVE, LANDMARK_THREE_ISLAND, MUSIC_ROUTE_3, TRUE, PALETTE_NITE, FISHGROUP_POND
assert_table_length NUM_THREE_ISLAND_MAPS

BIN
data/tilesets/sevii_attributes.bin
View file

Binary file not shown.

8
data/tilesets/sevii_collision.asm
View file

@ -118,3 +118,11 @@
tilecoll WATER, WALL, WALL, WALL ; 75
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 76
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 77
tilecoll WALL, WALL, WALL, FLOOR ; 78
tilecoll WALL, WALL, FLOOR, WALL ; 79
tilecoll WALL, WALL, FLOOR, FLOOR ; 7a
tilecoll FLOOR, FLOOR, WALL, WALL ; 7b
tilecoll FLOOR, FLOOR, WALL, FLOOR ; 7c
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 7d
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 7e
tilecoll FLOOR, WALL, FLOOR, FLOOR ; 7f

BIN
data/tilesets/sevii_metatiles.bin
View file

Binary file not shown.

9
engine/battle/start_battle.asm
View file

@ -78,12 +78,13 @@ PlayBattleMusic:
ld de, MUSIC_JOHTO_WILD_BATTLE
ld a, [wTimeOfDay]
cp NITE_F
jr nz, .done
jr nz, .gotodone
ld de, MUSIC_JOHTO_WILD_BATTLE_NIGHT
jr .done
.kantowild
ld de, MUSIC_KANTO_WILD_BATTLE
.gotodone
jr .done
.trainermusic
@ -140,6 +141,8 @@ PlayBattleMusic:
farcall RegionCheck
ld a, e
jr nc, .nihontrainer
; ld a, e
and a
jr nz, .kantotrainer
@ -147,6 +150,10 @@ PlayBattleMusic:
ld de, MUSIC_JOHTO_TRAINER_BATTLE
jr .done
.nihontrainer
ld de, MUSIC_NIHONTRAINERBATTLE
jr .done
.kantotrainer
ld de, MUSIC_KANTO_TRAINER_BATTLE

2
maps/DebugRoom.asm
View file

@ -404,7 +404,7 @@ DebugRoom_MapEvents:
warp_event 35, 17, OLD_CITY, 1 ; east warp
warp_event 5, 35, LAVENDER_TOWN, 1 ; southwest warp
warp_event 19, 34, SAFARI_ZONE_FUCHSIA_GATE_BETA, 3 ; southern warp
warp_event 33, 33, TWO_ISLAND, 1 ; southeast warp
warp_event 33, 33, THREE_ISLAND_PORT, 1 ; southeast warp
warp_event 5, 3, HAUNTED_HOUSE_FOYER, 1
warp_event 34, 11, WINNERS_PATH, 3

BIN
maps/ThreeIsland.ablk
View file

Binary file not shown.

BIN
maps/ThreeIslandPort.ablk
View file

Binary file not shown.

2
maps/ThreeIslandPort.asm
View file

@ -9,6 +9,8 @@ ThreeIslandPort_MapEvents:
db 0, 0 ; filler
def_warp_events
warp_event 8, 9, DEBUG_ROOM, 1
warp_event 9, 9, DEBUG_ROOM, 1
def_coord_events