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

Sepia City Gym & badge infrastructure

Browse source 
Nihon badges now count and Sepia City has its Gym Leader. All fully functional.

I've also distributed the transfer-exclusive Kanto Pokemon items to their relevant owners, plus the Polkadot Bow.
This commit is contained in:
Llinos Evans 2024-07-25 15:29:35 +01:00
parent 7a5cbd31dc
commit cd08f11fa4
31 changed files with 462 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

9
data/events/engine_flags.asm
View file

@ -61,6 +61,15 @@ EngineFlags:
engine_flag wKantoBadges, MARSHBADGE
engine_flag wKantoBadges, VOLCANOBADGE
engine_flag wKantoBadges, EARTHBADGE
engine_flag wNihonBadges, BADGE1
engine_flag wNihonBadges, BADGE2
engine_flag wNihonBadges, BADGE3
engine_flag wNihonBadges, BADGE4
engine_flag wNihonBadges, BADGE5
engine_flag wNihonBadges, BADGE6
engine_flag wNihonBadges, BADGE7
engine_flag wNihonBadges, BADGE8
; unown sets (see data/wild/unlocked_unowns.asm)
engine_flag wUnlockedUnowns, UNLOCKED_UNOWNS_A_TO_K_F

1
data/maps/attributes.asm
View file

@ -832,6 +832,7 @@ ENDM
map_attributes OldCityEarlsHouse, OLD_CITY_EARLS_HOUSE, $00, 0
map_attributes OldCityFamilyHouse, OLD_CITY_FAMILY_HOUSE, $00, 0
map_attributes SepiaSchool, SEPIA_SCHOOL, $00, 0
map_attributes OldCityGym, OLD_CITY_GYM, $00, 0
map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.

3
data/maps/blocks.asm
View file

@ -1240,3 +1240,6 @@ WhiteCity_Blocks:
Route66WhiteCityGate_Blocks:
INCBIN "maps/NihonGateEastWest.ablk"
OldCityGym_Blocks:
INCBIN "maps/OldCityGym.ablk"

1
data/maps/maps.asm
View file

@ -703,6 +703,7 @@ MapGroup_OldCity:
map OldCityEarlsHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_OLD_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
map OldCityFamilyHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_OLD_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
map SepiaSchool, TILESET_LAB, INDOOR, LANDMARK_OLD_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
map OldCityGym, TILESET_TOWER, INDOOR, LANDMARK_OLD_CITY, MUSIC_GYM, FALSE, PALETTE_DAY, FISHGROUP_NONE
assert_table_length NUM_OLD_CITY_MAPS
MapGroup_BlueForest:

4
data/maps/scripts.asm
View file

@ -588,8 +588,10 @@ INCLUDE "maps/SepiaSchool.asm"
INCLUDE "maps/WhiteCity.asm"
INCLUDE "maps/Route66WhiteCityGate.asm"
SECTION "Map Scripts 30", ROMX
INCLUDE "maps/OldCityGym.asm"
SECTION "Map Scripts 30", ROMX ; spillover
SECTION "Map Scripts 31", ROMX ; spillover
INCLUDE "maps/TanobyRuins.asm"
INCLUDE "maps/TanobyChambers.asm"
INCLUDE "maps/NavalRockExterior.asm"

2
data/pokemon/base_stats/chansey.asm
View file

@ -6,7 +6,7 @@
db NORMAL, NORMAL ; type
db 30 ; catch rate
db 255 ; base exp
db NO_ITEM, LUCKY_EGG ; items
db LUCKY_PUNCH, LUCKY_EGG ; items
db GENDER_F100 ; gender ratio
db 100 ; unknown 1
db 40 ; step cycles to hatch

2
data/pokemon/base_stats/ditto.asm
View file

@ -6,7 +6,7 @@
db NORMAL, NORMAL ; type
db 35 ; catch rate
db 61 ; base exp
db NO_ITEM, NO_ITEM ; items
db NO_ITEM, METAL_POWDER ; items
db GENDER_UNKNOWN ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch

2
data/pokemon/base_stats/kadabra.asm
View file

@ -6,7 +6,7 @@
db PSYCHIC_TYPE, PSYCHIC_TYPE ; type
db 100 ; catch rate
db 145 ; base exp
db NO_ITEM, NO_ITEM ; items
db NO_ITEM, TWISTEDSPOON ; items
db GENDER_F25 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch

2
data/pokemon/base_stats/mimmeo.asm
View file

@ -6,7 +6,7 @@
db STEEL, STEEL ; type
db 35 ; catch rate
db 161 ; base exp
db NO_ITEM, NO_ITEM ; items
db NO_ITEM, METAL_POWDER ; items
db GENDER_UNKNOWN ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch

2
data/pokemon/base_stats/pikachu.asm
View file

@ -6,7 +6,7 @@
db ELECTRIC, ELECTRIC ; type
db 190 ; catch rate
db 82 ; base exp
db NO_ITEM, BERRY ; items
db NO_ITEM, LIGHT_BALL ; items
db GENDER_F50 ; gender ratio
db 100 ; unknown 1
db 10 ; step cycles to hatch

2
data/pokemon/base_stats/snubbull.asm
View file

@ -6,7 +6,7 @@
db NORMAL, NORMAL ; type
db 190 ; catch rate
db 63 ; base exp
db NO_ITEM, NO_ITEM ; items
db NO_ITEM, POLKADOT_BOW ; items
db GENDER_F75 ; gender ratio
db 100 ; unknown 1
db 20 ; step cycles to hatch

BIN
data/tilesets/tower_attributes.bin
View file

Binary file not shown.

20
data/tilesets/tower_collision.asm
View file

@ -38,8 +38,8 @@
tilecoll WALL, WALL, PIT, FLOOR ; 25
tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 26
tilecoll WARP_CARPET_UP, WARP_CARPET_UP, FLOOR, FLOOR ; 27
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 28
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 29
tilecoll FLOOR, FLOOR, WALL, FLOOR ; 28
tilecoll FLOOR, WALL, FLOOR, FLOOR ; 29
tilecoll WALL, WALL, WALL, WALL ; 2a
tilecoll WALL, HOP_LEFT, WALL, WALL ; 2b
tilecoll HOP_RIGHT, WALL, WALL, WALL ; 2c
@ -62,3 +62,19 @@
tilecoll WALL, HOP_DOWN, WALL, WALL ; 3d
tilecoll HOP_DOWN, WALL, WALL, WALL ; 3e
tilecoll HOP_DOWN_RIGHT, WALL, WALL, WALL ; 3f
tilecoll WALL, WALL, FLOOR, FLOOR ; 40
tilecoll WALL, WALL, FLOOR, FLOOR ; 41
tilecoll WALL, WALL, FLOOR, FLOOR ; 42
tilecoll WALL, WALL, FLOOR, FLOOR ; 43
tilecoll WALL, WALL, FLOOR, FLOOR ; 44
tilecoll WALL, WALL, FLOOR, FLOOR ; 45
tilecoll WALL, WALL, FLOOR, FLOOR ; 46
tilecoll WALL, WALL, FLOOR, FLOOR ; 47
tilecoll WALL, WALL, FLOOR, FLOOR ; 48
tilecoll WALL, WALL, FLOOR, FLOOR ; 49
tilecoll WALL, FLOOR, WALL, FLOOR ; 4a
tilecoll FLOOR, WALL, FLOOR, WALL ; 4b
tilecoll FLOOR, WALL, FLOOR, FLOOR ; 4c
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 4d
tilecoll WALL, WALL, FLOOR, WALL ; 4e
tilecoll WALL, WALL, WALL, FLOOR ; 4f

4
data/tilesets/tower_metatiles.bin
View file

@ -1,2 +1,4 @@
 @ !!A1A1!!!!!!@ A1A1
A1A1A1A1A1A1A1A1A1A1!!!!!!!!A1A1!!!! -.=><>MN./>?,NO()89*+:;()89*+:;MN]^NO^_A1A1@ !!A1A1!!@ !!!!^^^^"#23&'67"#23&'67PQPQPQPQPQPQPQPQ$$$$  "#23!!67"#!!2367%545%545%545%545 ^^  FV GW PQPQRSRSBCHZ[!XL\67IBCY!Z[L\67JKZ[L\67JKZ[L\67DETU!!!!PPPPPPPPFV   GW 
A1A1A1A1A1A1A1A1A1A1!!!!!!!!A1A1!!!! -.=><>MN./>?,NO()89*+:;()89*+:;MN]^NO^_A1A1@ !!A1A1!!@ !!!!^^^^"#23&'67"#23&'67PQPQPQPQPQPQPQPQ$$$$  "#23!!67"#!!2367%545%545%545%545 ^^  
GHWX
GHWXFV GW PQPQRSRSBCHZ[!XL\67IBCY!Z[L\67JKZ[L\67JKZ[L\67DETU!!!!PPPPPPPPFV   GW 0123!!4501!!2345EFUV!!55EF!!UV55IJYZ!!55IJ!!YZ55KL[\!!55KL!![\556789!!5567!!8955!!^^!!^^!!!!!!!!!!!!!!!!

15
data/trainers/parties.asm
View file

@ -1359,20 +1359,17 @@ BirdKeeperGroup:
db -1 ; end
next_list_item ; BIRD_KEEPER (19)
db "FREDERICK@", TRAINERTYPE_MOVES ; Reference to the Frederick II of Hohenstaufen, one of the earliest knowledgable Falconers in history
db "FRED@", TRAINERTYPE_MOVES ; Reference to the Frederick II of Hohenstaufen, one of the earliest knowledgable Falconers in history
db 50
dw TREBIR
dw PERISH_SONG, ENCORE, SING, WING_ATTACK
dw AERCROW
dw MEGAPHONE, WING_ATTACK, WHIRLWIND, PETAL_DANCE
db 50
dw FEAROW
dw MIRROR_MOVE, DOUBLE_EDGE, STEEL_WING, DRILL_PECK
db 50
dw HONCHKROW
dw PURSUIT, DRILL_PECK, NIGHT_SHADE, QUICK_ATTACK
dw CARETORKER
dw SOFTBOILED, WHIRLWIND, HEAL_BELL, DRILL_PECK
db -1 ; end
next_list_item ; BIRD_KEEPER (19)
db "NORIKAGE@", TRAINERTYPE_MOVES ; Asakura Norikage 朝倉 教景 (1476 - 1555), brought Goshawk breeding to Asakura Clan in the 16th Century.
db "KAGE@", TRAINERTYPE_MOVES ; Asakura Norikage 朝倉 教景 (1476 - 1555), brought Goshawk breeding to Asakura Clan in the 16th Century.
db 50
dw DELIBIRD
dw PRESENT, ICY_WIND, QUICK_ATTACK, THIEF

11
data/types/badge_type_boosts.asm
View file

@ -18,4 +18,15 @@ BadgeTypeBoosts:
db PSYCHIC_TYPE ; MARSHBADGE
db FIRE ; VOLCANOBADGE
db GROUND ; EARTHBADGE
; Nihon Badges
; Unsure what to do with these, so let's leave it for now.
; South's will boost Fairy, though.
db CURSE_TYPE
db CURSE_TYPE
db CURSE_TYPE
db CURSE_TYPE
db CURSE_TYPE
db CURSE_TYPE
db CURSE_TYPE
db CURSE_TYPE
db -1 ; end