thorn/kep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/kep-hack.git synced 2025-11-10 23:40:59 +13:00
Code Issues Actions Packages Projects Releases Wiki Activity

Citrine Pass and a few little tweaks

Browse source
This commit is contained in:
MementoMartha 2022-10-02 17:16:30 +01:00
parent f6f43781b8
commit a05796ece5
14 changed files with 59 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
constants/item_constants.asm
View file

@ -114,6 +114,7 @@ DEF NUM_ITEMS EQU const_value - 1
const POISON_STONE ; $64 const POISON_STONE ; $64
const BLK_AUGURITE ; $65 const BLK_AUGURITE ; $65
const DUBIOUS_DISC ; $66 const DUBIOUS_DISC ; $66
const CITRINE_PASS ; $67
DEF NUM_FLOORS EQU const_value - 1 - NUM_ITEMS DEF NUM_FLOORS EQU const_value - 1 - NUM_ITEMS
const_next $C4 const_next $C4

58
constants/map_constants.asm
View file

@ -28,7 +28,7 @@ ENDM
mapconst INDIGO_PLATEAU, 9, 10 ; $09 mapconst INDIGO_PLATEAU, 9, 10 ; $09
mapconst SAFFRON_CITY, 18, 20 ; $0A mapconst SAFFRON_CITY, 18, 20 ; $0A
DEF NUM_CITY_MAPS EQU const_value DEF NUM_CITY_MAPS EQU const_value
mapconst UNUSED_MAP_0B, 0, 0 ; $0B mapconst UNUSED_MAP_0B, 18, 20 ; $0B ; Citrine City
DEF FIRST_ROUTE_MAP EQU const_value DEF FIRST_ROUTE_MAP EQU const_value
mapconst ROUTE_1, 18, 10 ; $0C mapconst ROUTE_1, 18, 10 ; $0C
mapconst ROUTE_2, 36, 10 ; $0D mapconst ROUTE_2, 36, 10 ; $0D
@ -88,16 +88,16 @@ DEF FIRST_INDOOR_MAP EQU const_value
mapconst BIKE_SHOP, 4, 4 ; $42 mapconst BIKE_SHOP, 4, 4 ; $42
mapconst CERULEAN_MART, 4, 4 ; $43 mapconst CERULEAN_MART, 4, 4 ; $43
mapconst MT_MOON_POKECENTER, 4, 7 ; $44 mapconst MT_MOON_POKECENTER, 4, 7 ; $44
mapconst CERULEAN_TRASHED_HOUSE_COPY, 4, 4 ; $45 mapconst CERULEAN_TRASHED_HOUSE_COPY, 4, 4 ; $45 ; Unused
mapconst ROUTE_5_GATE, 3, 4 ; $46 mapconst ROUTE_5_GATE, 3, 4 ; $46
mapconst UNDERGROUND_PATH_ROUTE_5, 4, 4 ; $47 mapconst UNDERGROUND_PATH_ROUTE_5, 4, 4 ; $47
mapconst DAYCARE, 4, 4 ; $48 mapconst DAYCARE, 4, 4 ; $48
mapconst ROUTE_6_GATE, 3, 4 ; $49 mapconst ROUTE_6_GATE, 3, 4 ; $49
mapconst UNDERGROUND_PATH_ROUTE_6, 4, 4 ; $4A mapconst UNDERGROUND_PATH_ROUTE_6, 4, 4 ; $4A
mapconst UNDERGROUND_PATH_ROUTE_6_COPY, 4, 4 ; $4B mapconst UNDERGROUND_PATH_ROUTE_6_COPY, 4, 4 ; $4B ; Unused
mapconst ROUTE_7_GATE, 4, 3 ; $4C mapconst ROUTE_7_GATE, 4, 3 ; $4C
mapconst UNDERGROUND_PATH_ROUTE_7, 4, 4 ; $4D mapconst UNDERGROUND_PATH_ROUTE_7, 4, 4 ; $4D
mapconst UNDERGROUND_PATH_ROUTE_7_COPY, 4, 4 ; $4E mapconst UNDERGROUND_PATH_ROUTE_7_COPY, 4, 4 ; $4E ; Unused
mapconst ROUTE_8_GATE, 4, 3 ; $4F mapconst ROUTE_8_GATE, 4, 3 ; $4F
mapconst UNDERGROUND_PATH_ROUTE_8, 4, 4 ; $50 mapconst UNDERGROUND_PATH_ROUTE_8, 4, 4 ; $50
mapconst ROCK_TUNNEL_POKECENTER, 4, 7 ; $51 mapconst ROCK_TUNNEL_POKECENTER, 4, 7 ; $51
@ -124,19 +124,19 @@ DEF FIRST_INDOOR_MAP EQU const_value
mapconst SS_ANNE_1F_ROOMS, 8, 12 ; $66 mapconst SS_ANNE_1F_ROOMS, 8, 12 ; $66
mapconst SS_ANNE_2F_ROOMS, 8, 12 ; $67 mapconst SS_ANNE_2F_ROOMS, 8, 12 ; $67
mapconst SS_ANNE_B1F_ROOMS, 8, 12 ; $68 mapconst SS_ANNE_B1F_ROOMS, 8, 12 ; $68
mapconst UNUSED_MAP_69, 0, 0 ; $69 mapconst UNUSED_MAP_69, 0, 0 ; $69 ; Gauntlet Floor 1: Viridian Forest
mapconst UNUSED_MAP_6A, 0, 0 ; $6A mapconst UNUSED_MAP_6A, 0, 0 ; $6A ; Gauntlet Floor 2: Mt. Moon
mapconst UNUSED_MAP_6B, 0, 0 ; $6B mapconst UNUSED_MAP_6B, 0, 0 ; $6B ; Gauntlet Floor 3: S.S. Anne
mapconst VICTORY_ROAD_1F, 9, 10 ; $6C mapconst VICTORY_ROAD_1F, 9, 10 ; $6C
mapconst UNUSED_MAP_6D, 0, 0 ; $6D mapconst UNUSED_MAP_6D, 0, 0 ; $6D ; Gauntlet Floor 4: Lavender Tower
mapconst UNUSED_MAP_6E, 0, 0 ; $6E mapconst UNUSED_MAP_6E, 0, 0 ; $6E ; Gauntlet Floor 5: Safari Zone
mapconst UNUSED_MAP_6F, 0, 0 ; $6F mapconst UNUSED_MAP_6F, 0, 0 ; $6F ; Gauntlet Floor 6: Pokemon Mansion
mapconst UNUSED_MAP_70, 0, 0 ; $70 mapconst UNUSED_MAP_70, 0, 0 ; $70 ; Gauntlet Floor 7: Chief's Office
mapconst LANCES_ROOM, 13, 13 ; $71 mapconst LANCES_ROOM, 13, 13 ; $71
mapconst UNUSED_MAP_72, 0, 0 ; $72 mapconst UNUSED_MAP_72, 0, 0 ; $72 ; Unused
mapconst UNUSED_MAP_73, 0, 0 ; $73 mapconst UNUSED_MAP_73, 0, 0 ; $73 ; Unused
mapconst UNUSED_MAP_74, 0, 0 ; $74 mapconst UNUSED_MAP_74, 0, 0 ; $74 ; Unused
mapconst UNUSED_MAP_75, 0, 0 ; $75 mapconst UNUSED_MAP_75, 0, 0 ; $75 ; Unused
mapconst HALL_OF_FAME, 4, 5 ; $76 mapconst HALL_OF_FAME, 4, 5 ; $76
mapconst UNDERGROUND_PATH_NORTH_SOUTH, 24, 4 ; $77 mapconst UNDERGROUND_PATH_NORTH_SOUTH, 24, 4 ; $77
mapconst CHAMPIONS_ROOM, 4, 4 ; $78 mapconst CHAMPIONS_ROOM, 4, 4 ; $78
@ -163,9 +163,9 @@ DEF FIRST_INDOOR_MAP EQU const_value
mapconst LAVENDER_POKECENTER, 4, 7 ; $8D mapconst LAVENDER_POKECENTER, 4, 7 ; $8D
mapconst POKEMON_TOWER_1F, 9, 10 ; $8E mapconst POKEMON_TOWER_1F, 9, 10 ; $8E
mapconst POKEMON_TOWER_2F, 9, 10 ; $8F mapconst POKEMON_TOWER_2F, 9, 10 ; $8F
mapconst POKEMON_TOWER_3F, 9, 10 ; $90 mapconst POKEMON_TOWER_3F, 9, 10 ; $90 ; Unused
mapconst POKEMON_TOWER_4F, 9, 10 ; $91 mapconst POKEMON_TOWER_4F, 9, 10 ; $91 ; Unused
mapconst POKEMON_TOWER_5F, 9, 10 ; $92 mapconst POKEMON_TOWER_5F, 9, 10 ; $92 ; Unused
mapconst POKEMON_TOWER_6F, 9, 10 ; $93 mapconst POKEMON_TOWER_6F, 9, 10 ; $93
mapconst POKEMON_TOWER_7F, 9, 10 ; $94 mapconst POKEMON_TOWER_7F, 9, 10 ; $94
mapconst MR_FUJIS_HOUSE, 4, 4 ; $95 mapconst MR_FUJIS_HOUSE, 4, 4 ; $95
@ -192,7 +192,7 @@ DEF FIRST_INDOOR_MAP EQU const_value
mapconst CINNABAR_LAB_FOSSIL_ROOM, 4, 4 ; $AA mapconst CINNABAR_LAB_FOSSIL_ROOM, 4, 4 ; $AA
mapconst CINNABAR_POKECENTER, 4, 7 ; $AB mapconst CINNABAR_POKECENTER, 4, 7 ; $AB
mapconst CINNABAR_MART, 4, 4 ; $AC mapconst CINNABAR_MART, 4, 4 ; $AC
mapconst CINNABAR_MART_COPY, 4, 4 ; $AD mapconst CINNABAR_MART_COPY, 4, 4 ; $AD ; Unused
mapconst INDIGO_PLATEAU_LOBBY, 6, 8 ; $AE mapconst INDIGO_PLATEAU_LOBBY, 6, 8 ; $AE
mapconst COPYCATS_HOUSE_1F, 4, 4 ; $AF mapconst COPYCATS_HOUSE_1F, 4, 4 ; $AF
mapconst COPYCATS_HOUSE_2F, 4, 4 ; $B0 mapconst COPYCATS_HOUSE_2F, 4, 4 ; $B0
@ -218,14 +218,14 @@ DEF FIRST_INDOOR_MAP EQU const_value
mapconst VERMILION_TRADE_HOUSE, 4, 4 ; $C4 mapconst VERMILION_TRADE_HOUSE, 4, 4 ; $C4
mapconst DIGLETTS_CAVE, 18, 20 ; $C5 mapconst DIGLETTS_CAVE, 18, 20 ; $C5
mapconst VICTORY_ROAD_3F, 9, 15 ; $C6 mapconst VICTORY_ROAD_3F, 9, 15 ; $C6
mapconst ROCKET_HIDEOUT_B1F, 14, 11 ; $C7, now part of viridian gym mapconst ROCKET_HIDEOUT_B1F, 14, 11 ; $C7
mapconst ROCKET_HIDEOUT_B2F, 14, 15 ; $C8 mapconst ROCKET_HIDEOUT_B2F, 14, 15 ; $C8 ; Unused, Citrine PokeCenter?
mapconst ROCKET_HIDEOUT_B3F, 14, 15 ; $C9 mapconst ROCKET_HIDEOUT_B3F, 14, 15 ; $C9 ; Unused, Citrine PokeMart?
mapconst ROCKET_HIDEOUT_B4F, 12, 15 ; $CA mapconst ROCKET_HIDEOUT_B4F, 12, 15 ; $CA ; Unused, Citrine House 1?
mapconst ROCKET_HIDEOUT_ELEVATOR, 4, 3 ; $CB mapconst ROCKET_HIDEOUT_ELEVATOR, 4, 3 ; $CB ; Unused, Citrine House 2?
mapconst UNUSED_MAP_CC, 0, 0 ; $CC mapconst UNUSED_MAP_CC, 0, 0 ; $CC ; Unused, Citrine Dock?
mapconst UNUSED_MAP_CD, 0, 0 ; $CD mapconst UNUSED_MAP_CD, 0, 0 ; $CD ; Unused, Citrine Cave?
mapconst UNUSED_MAP_CE, 0, 0 ; $CE mapconst UNUSED_MAP_CE, 0, 0 ; $CE ; Unused
mapconst SILPH_CO_2F, 9, 15 ; $CF mapconst SILPH_CO_2F, 9, 15 ; $CF
mapconst SILPH_CO_3F, 9, 15 ; $D0 mapconst SILPH_CO_3F, 9, 15 ; $D0
mapconst SILPH_CO_4F, 9, 15 ; $D1 mapconst SILPH_CO_4F, 9, 15 ; $D1
@ -263,10 +263,10 @@ DEF FIRST_INDOOR_MAP EQU const_value
mapconst CELADON_UNIVERSITY_OUTSIDE, 20, 21 ; $F1 - was UNUSED_MAP_F1 mapconst CELADON_UNIVERSITY_OUTSIDE, 20, 21 ; $F1 - was UNUSED_MAP_F1
mapconst CELADON_UNIVERSITY_INSIDE, 10, 11 ; $F2 - was UNUSED_MAP_F2 mapconst CELADON_UNIVERSITY_INSIDE, 10, 11 ; $F2 - was UNUSED_MAP_F2
mapconst CELADON_UNIVERSITY_POKECENTER, 4, 7 ; $F3 - was UNUSED_MAP_F3 mapconst CELADON_UNIVERSITY_POKECENTER, 4, 7 ; $F3 - was UNUSED_MAP_F3
mapconst UNUSED_MAP_F4, 0, 0 ; $F4 mapconst UNUSED_MAP_F4, 0, 0 ; $F4 ; Unused, Bill's Garden
mapconst LORELEIS_ROOM, 6, 5 ; $F5 mapconst LORELEIS_ROOM, 6, 5 ; $F5
mapconst BRUNOS_ROOM, 6, 5 ; $F6 mapconst BRUNOS_ROOM, 6, 5 ; $F6
mapconst AGATHAS_ROOM, 6, 5 ; $F7 mapconst AGATHAS_ROOM, 6, 5 ; $F7 ; Maps F8 - FE currently have no data
DEF NUM_MAPS EQU const_value DEF NUM_MAPS EQU const_value
; Indoor maps, such as houses, use this as the Map ID in their exit warps ; Indoor maps, such as houses, use this as the Map ID in their exit warps

1
data/items/key_items.asm
View file

@ -102,4 +102,5 @@ KeyItemFlags:
dbit FALSE ; POISON_STONE dbit FALSE ; POISON_STONE
dbit FALSE ; BLK_AUGURITE dbit FALSE ; BLK_AUGURITE
dbit FALSE ; DUBIOUS_DISC dbit FALSE ; DUBIOUS_DISC
dbit TRUE ; CITRINE_PASS
end_bit_array NUM_ITEMS + NUM_FLOORS end_bit_array NUM_ITEMS + NUM_FLOORS

1
data/items/names.asm
View file

@ -103,4 +103,5 @@ ItemNames::
li "POISON STONE" li "POISON STONE"
li "BLK AUGURITE" li "BLK AUGURITE"
li "DUBIOUS DISC" li "DUBIOUS DISC"
li "CITRINE PASS"
assert_list_length NUM_ITEMS + NUM_FLOORS assert_list_length NUM_ITEMS + NUM_FLOORS

1
data/items/prices.asm
View file

@ -103,4 +103,5 @@ ItemPrices::
bcd3 2100 ; POISON_STONE bcd3 2100 ; POISON_STONE
bcd3 2100 ; BLK_AUGURITE bcd3 2100 ; BLK_AUGURITE
bcd3 3000 ; DUBIOUS_DISC bcd3 3000 ; DUBIOUS_DISC
bcd3 0 ; CITRINE_PASS
assert_table_length NUM_ITEMS + NUM_FLOORS assert_table_length NUM_ITEMS + NUM_FLOORS

12
data/maps/objects/PokemonTower6F.asm
View file

@ -2,16 +2,16 @@ PokemonTower6F_Object:
db $1 ; border block db $1 ; border block
def_warp_events def_warp_events
warp_event 18, 9, POKEMON_TOWER_2F, 2 warp_event 3, 9, POKEMON_TOWER_2F, 2
warp_event 9, 16, POKEMON_TOWER_7F, 1 warp_event 9, 16, POKEMON_TOWER_7F, 1
def_bg_events def_bg_events
def_object_events def_object_events
object_event 12, 10, SPRITE_CHANNELER, STAY, RIGHT, 1, OPP_CHANNELER, 19 object_event 9, 10, SPRITE_CHANNELER, STAY, RIGHT, 1, OPP_CHANNELER, 19
object_event 9, 5, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 20 object_event 12, 5, SPRITE_CHANNELER, STAY, DOWN, 2, OPP_CHANNELER, 20
object_event 16, 5, SPRITE_CHANNELER, STAY, LEFT, 3, OPP_CHANNELER, 21 object_event 5, 5, SPRITE_CHANNELER, STAY, LEFT, 3, OPP_CHANNELER, 21
object_event 6, 8, SPRITE_POKE_BALL, STAY, NONE, 4, RARE_CANDY object_event 15, 8, SPRITE_POKE_BALL, STAY, NONE, 4, RARE_CANDY
object_event 14, 14, SPRITE_POKE_BALL, STAY, NONE, 5, X_ACCURACY object_event 7, 14, SPRITE_POKE_BALL, STAY, NONE, 5, X_ACCURACY
def_warps_to POKEMON_TOWER_6F def_warps_to POKEMON_TOWER_6F

1
data/maps/objects/VermilionCity.asm
View file

@ -29,5 +29,6 @@ VermilionCity_Object:
object_event 29, 9, SPRITE_MONSTER, WALK, UP_DOWN, 5 ; person object_event 29, 9, SPRITE_MONSTER, WALK, UP_DOWN, 5 ; person
object_event 25, 27, SPRITE_SAILOR, WALK, LEFT_RIGHT, 6 ; person object_event 25, 27, SPRITE_SAILOR, WALK, LEFT_RIGHT, 6 ; person
object_event 31, 27, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 14 ; person object_event 31, 27, SPRITE_COOLTRAINER_F, WALK, LEFT_RIGHT, 14 ; person
object_event 11, 30, SPRITE_SAILOR, STAY, UP, 15 ; person
def_warps_to VERMILION_CITY def_warps_to VERMILION_CITY

2
engine/battle/common_text.asm
View file

@ -3,7 +3,7 @@ PrintBeginningBattleText:
dec a dec a
jr nz, .trainerBattle jr nz, .trainerBattle
ld a, [wCurMap] ld a, [wCurMap]
cp POKEMON_TOWER_3F cp POKEMON_TOWER_2F
jr c, .notPokemonTower jr c, .notPokemonTower
cp POKEMON_TOWER_7F + 1 cp POKEMON_TOWER_7F + 1
jr c, .pokemonTower jr c, .pokemonTower

1
engine/debug/debug_party.asm
View file

@ -149,6 +149,7 @@ DebugItemsList:
db SECRET_KEY, 1 db SECRET_KEY, 1
db CARD_KEY, 1 db CARD_KEY, 1
db S_S_TICKET, 1 db S_S_TICKET, 1
db CITRINE_PASS, 1
db SUPER_ROD, 1 db SUPER_ROD, 1
db COIN_CASE, 1 db COIN_CASE, 1
db POKE_FLUTE, 1 db POKE_FLUTE, 1

1
engine/items/item_effects.asm
View file

@ -119,6 +119,7 @@ ItemUsePtrTable:
dw ItemUseEvoStone ; POISON_STONE dw ItemUseEvoStone ; POISON_STONE
dw ItemUseEvoStone ; BLK_AUGURITE dw ItemUseEvoStone ; BLK_AUGURITE
dw ItemUseEvoStone ; DUBIOUS_DISC dw ItemUseEvoStone ; DUBIOUS_DISC
dw UnusableItem ; CITRINE_PASS
ItemUseBall: ItemUseBall:

9
maps/BillsGarden.blk Normal file
View file

@ -0,0 +1,9 @@
,,;QQQQ>,,,+%tt
t$*,,)
(,,)eCd (,,)
t (,,)t
(,,)
t
(,,,?;tt>?,,WWW%
$WWW

BIN
maps/CitrineCity.blk
View file

Binary file not shown.

4
maps/PokemonTower6F.blk
View file

@ -1,2 +1,2 @@
`[a]66 ^NL6R6_  `[a]66\ ^6R6LM_ 
6666R6LZRPOOL66O6LLOO W6O6OQX O6R 0 L6R666666LOOQRY66OLL6O WPO6O6X L6O 0

2
text/PokemonFanClub.asm
View file

@ -39,7 +39,7 @@ FanClubMeetChairText::
line "#MON Fan Club!" line "#MON Fan Club!"
para "I have collected" para "I have collected"
line "over 100 #MON!" line "over 150 #MON!"
para "I'm very fussy" para "I'm very fussy"
line "when it comes to" line "when it comes to"