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

OId City

Browse source 
This implements Old City, the Honey Grandma's House, and its Pokecenter+Mart. Bunch of other bits and pieces not added yet, need to figure out the lore for them.

Honey Grandma is designed to make it easier to get important Pokemon, rather than give access to anything new. Thus, she's Nihon-locked by being an Old City resident. Martha's Perfect Rod will follow this trend.

Gold Berry tree exists to make them renewable in-game, I think this is very important.

The flypoint seems bugged.
This commit is contained in:
Llinos Evans 2024-07-22 23:40:53 +01:00
parent aa970c326e
commit 4eb81eec25
47 changed files with 699 additions and 147 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
constants/engine_flags.asm
View file

@ -90,6 +90,7 @@
const ENGINE_FLYPOINT_BLACKTHORN
const ENGINE_FLYPOINT_SILVER_CAVE
const ENGINE_FLYPOINT_SILENT_HILLS
const ENGINE_FLYPOINT_OLD
const ENGINE_FLYPOINT_UNUSED
; wLuckyNumberShowFlag
const ENGINE_LUCKY_NUMBER_SHOW

3
constants/landmark_constants.asm
View file

@ -127,12 +127,13 @@ DEF KANTO_LANDMARK EQU const_value
const LANDMARK_SEVEN_ISLAND
DEF NIHON_LANDMARK EQU const_value
const LANDMARK_WINNERS_PATH
const LANDMARK_ROUTE_66
const LANDMARK_SILENT_HILLS
const LANDMARK_DEBUG_ROOM
const LANDMARK_ROUTE_49
const LANDMARK_QUIET_CAVE
const LANDMARK_OLD_CITY
const LANDMARK_BLUE_FOREST
const LANDMARK_ROUTE_66
DEF NUM_LANDMARKS EQU const_value
; used in CaughtData

9
constants/map_constants.asm
View file

@ -166,7 +166,7 @@ ENDM
map_const ECRUTEAK_GYM, 5, 9 ; 7
map_const ECRUTEAK_ITEMFINDER_HOUSE, 4, 4 ; 8
map_const ECRUTEAK_CITY, 20, 18 ; 9
map_const BELLCHIME_TRAIL, 12, 7
map_const BELLCHIME_TRAIL, 12, 7 ; 10
endgroup
newgroup BLACKTHORN ; 5
@ -635,6 +635,13 @@ ENDM
map_const BLUE_LAB, 12, 10 ; 17
endgroup
newgroup OLD_CITY
map_const OLD_CITY, 20, 18 ; 1
map_const OLD_CITY_POKECENTER_1F, 10, 4 ; 2
map_const OLD_MART, 8, 4 ; 3
map_const HONEY_GRANDMAS_HOUSE, 5, 5 ; 4
endgroup
newgroup BLUE_FOREST ; 36
map_const BLUE_FOREST, 20, 18 ; 1
endgroup

1
constants/map_data_constants.asm
View file

@ -104,6 +104,7 @@ DEF NUM_FISHGROUPS EQU const_value - 1
const SPAWN_FAST_SHIP
; nihon
const SPAWN_SILENT_HILLS
const SPAWN_OLD_CITY
DEF NUM_SPAWNS EQU const_value
DEF SPAWN_N_A EQU -1

1
constants/mart_constants.asm
View file

@ -43,4 +43,5 @@
const MART_INDIGO_PLATEAU
const MART_UNDERGROUND
const MART_LAKEOFRAGE
const MART_OLDCITY
DEF NUM_MARTS EQU const_value

1
constants/scgb_constants.asm
View file

@ -80,6 +80,7 @@ DEF SCGB_DEFAULT EQU $ff
const PREDEFPAL_SIX_ISLAND
const PREDEFPAL_SEVEN_ISLAND
const PREDEFPAL_SILENT_HILLS
const PREDEFPAL_OLD_CITY
const PREDEFPAL_BLUE_FOREST
const PREDEFPAL_NITE
const PREDEFPAL_BLACKOUT

1
constants/script_constants.asm
View file

@ -239,6 +239,7 @@ DEF EMOTE_LENGTH EQU 6
const FRUITTREE_PEWTER_CITY_1 ; 1c
const FRUITTREE_PEWTER_CITY_2 ; 1d
const FRUITTREE_FUCHSIA_CITY ; 1e
const FRUITTREE_OLD_CITY ; 1F
DEF NUM_FRUIT_TREES EQU const_value - 1
; describedecoration arguments

1
constants/tileset_constants.asm
View file

@ -49,6 +49,7 @@
const TILESET_LAVENDER_CRYPT ; 2F
const TILESET_BLUE_LAB ; 30
const TILESET_NIHON_GATE ; 31
const TILESET_NIHON_MART ; 32
DEF NUM_TILESETS EQU const_value - 1
; wTileset struct size

1
data/events/engine_flags.asm
View file

@ -100,6 +100,7 @@ EngineFlags:
engine_flag wVisitedSpawns, SPAWN_BLACKTHORN
engine_flag wVisitedSpawns, SPAWN_MT_SILVER
engine_flag wVisitedSpawns, SPAWN_SILENT_HILLS
engine_flag wVisitedSpawns, SPAWN_OLD_CITY
engine_flag wVisitedSpawns, NUM_SPAWNS ; unused
engine_flag wLuckyNumberShowFlag, LUCKYNUMBERSHOW_GAME_OVER_F

1
data/items/fruit_trees.asm
View file

@ -31,4 +31,5 @@ FruitTreeItems:
db ICE_BERRY ; PEWTER_CITY_1
db MINT_BERRY ; PEWTER_CITY_2
db BURNT_BERRY ; FUCHSIA_CITY
db GOLD_BERRY ; OLD_CITY - now there's a farming spot!
assert_table_length NUM_FRUIT_TREES

14
data/items/marts.asm
View file

@ -36,6 +36,7 @@ Marts:
dw MartIndigoPlateau
dw MartUnderground
dw MartLakeOfRage
dw MartOldCity
assert_table_length NUM_MARTS
MartCherrygrove:
@ -421,3 +422,16 @@ MartLakeOfRage:
db DUSK_STONE
db SHINY_STONE
db -1 ; end
MartOldCity:
db 9 ; # items
db ULTRA_BALL
db HYPER_POTION
db FULL_HEAL
db REVIVE
db ANTIDOTE
db PARLYZ_HEAL
db AWAKENING
db MAX_REPEL
db PORTRAITMAIL
db -1 ; end

18
data/maps/attributes.asm
View file

@ -813,16 +813,24 @@ ENDM
map_attributes Route66, ROUTE_66, $05, WEST | SOUTH
connection south, WinnersPathOutside, WINNERS_PATH_OUTSIDE, 0
connection west, SilentHills, SILENT_HILLS, 0
map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.
map_attributes BlueLab, BLUE_LAB, $00, 0
connection west, SilentHills, SILENT_HILLS, 0
map_attributes QuietCave, QUIET_CAVE, $76, 0
map_attributes BlueLab, BLUE_LAB, $00, 0
map_attributes SilentHillsPokecenter1F, SILENT_HILLS_POKECENTER_1F, $00, 0
map_attributes SilversHouse, SILVERS_HOUSE, $00, 0
map_attributes CalsHouse1F, CALS_HOUSE_1F, $00, 0
map_attributes CalsHouse2F, CALS_HOUSE_2F, $00, 0
map_attributes SinjohRuinsExterior, SINJOH_RUINS_EXTERIOR, $00, 0
map_attributes SinjohRuinsInterior, SINJOH_RUINS_EXTERIOR, $00, 0
map_attributes OldCity, OLD_CITY, $00, 0 ; will have a west exit.
map_attributes Route49OldCityGate1F, ROUTE_49_OLD_CITY_GATE_1F, $00, 0
map_attributes Route49OldCityGate2F, ROUTE_49_OLD_CITY_GATE_2F, $00, 0
map_attributes OldCityPokecenter1F, OLD_CITY_POKECENTER_1F, $00, 0
map_attributes OldMart, OLD_MART, $00, 0
map_attributes HoneyGrandmasHouse, HONEY_GRANDMAS_HOUSE, $00, 0
map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.
map_attributes SinjohRuinsExterior, SINJOH_RUINS_EXTERIOR, $00, 0
map_attributes SinjohRuinsInterior, SINJOH_RUINS_EXTERIOR, $00, 0

11
data/maps/blocks.asm
View file

@ -1039,8 +1039,13 @@ Route49_2_Blocks:
; All Nihon Pokecenter1Fs go here.
SilentHillsPokecenter1F_Blocks:
OldCityPokecenter1F_Blocks:
INCBIN "maps/NihonPokecenter1F.ablk"
; All generic Nihon Pokemarts go here.
OldMart_Blocks:
INCBIN "maps/NihonMart.ablk"
NihonPokecenter2F_Blocks:
INCBIN "maps/NihonPokecenter2F.ablk"
@ -1219,3 +1224,9 @@ Route49OldCityGate2F_Blocks:
;InsertGateNameHere_Blocks:
; INCBIN "maps/NihonGateWestEast.ablk"
OldCity_Blocks:
INCBIN "maps/OldCity.ablk"
HoneyGrandmasHouse_Blocks:
INCBIN "maps/HoneyGrandmasHouse.ablk"

1
data/maps/flypoints.asm
View file

@ -29,4 +29,5 @@ Flypoints:
db LANDMARK_INDIGO_PLATEAU, SPAWN_INDIGO
; Nihon
db LANDMARK_SILENT_HILLS, SPAWN_SILENT_HILLS
db LANDMARK_OLD_CITY, SPAWN_OLD_CITY
db -1 ; end

4
data/maps/landmarks.asm
View file

@ -131,12 +131,13 @@ Landmarks:
landmark 0, 0, UnknownName ; Seven Island
assert_table_length NIHON_LANDMARK
landmark 108, 116, WinnersPathName
landmark 108, 108, Route66Name
landmark 92, 108, SilentHillsName
landmark 20, 28, UnknownName ; Debug Room
landmark 84, 108, Route49Name
landmark 76, 108, QuietCaveName
landmark 76, 100, OldCityName
landmark 140, 60, BlueForestName
landmark 108, 108, Route66Name
assert_table_length NUM_LANDMARKS
NewBarkTownName: db "NEW BARK¯TOWN@"
@ -248,4 +249,5 @@ UnknownName: db "?????@"
Route66Name: db "ROUTE 66@"
Route49Name: db "ROUTE 49@"
QuietCaveName: db "QUIET¯CAVE@"
OldCityName: db "OLD CITY@" ; I've considered the name "Archaic City", whereas "High Tech" will be "Vogue City". Thoughts? Archaic is considered a little snarly in modern day, so I haven't put it in yet.
BlueForestName: db "BLUE¯FOREST@"

13
data/maps/maps.asm
View file

@ -52,7 +52,8 @@ MapGroupPointers::
dw MapGroup_SixIsland ; 33
dw MapGroup_SevenIsland ; 34
dw MapGroup_SilentHills ; 35
dw MapGroup_BlueForest ; 36
dw MapGroup_OldCity ; 36
dw MapGroup_BlueForest ; 37
assert_table_length NUM_MAP_GROUPS
MapGroup_Olivine:
@ -691,7 +692,15 @@ MapGroup_SilentHills:
map Route49OldCityGate2F, TILESET_NIHON_GATE, GATE, LANDMARK_ROUTE_49, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_NONE
map BlueLab, TILESET_BLUE_LAB, INDOOR, LANDMARK_SILENT_HILLS, MUSIC_POKEMON_TALK, FALSE, PALETTE_DAY, FISHGROUP_NONE
assert_table_length NUM_SILENT_HILLS_MAPS
MapGroup_OldCity:
table_width MAP_LENGTH, MapGroup_OldCity
map OldCity, TILESET_NIHON_OLD, TOWN, LANDMARK_OLD_CITY, MUSIC_VIOLET_CITY, TRUE, PALETTE_AUTO, FISHGROUP_POND
map OldCityPokecenter1F, TILESET_POKECENTER, INDOOR, LANDMARK_OLD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_NONE
map OldMart, TILESET_NIHON_MART, INDOOR, LANDMARK_OLD_CITY, MUSIC_POKEMON_CENTER, FALSE, PALETTE_DAY, FISHGROUP_NONE
map HoneyGrandmasHouse, TILESET_TRADITIONAL_HOUSE, INDOOR, LANDMARK_OLD_CITY, MUSIC_VIOLET_CITY, FALSE, PALETTE_DAY, FISHGROUP_NONE
assert_table_length NUM_OLD_CITY_MAPS
MapGroup_BlueForest:
table_width MAP_LENGTH, MapGroup_BlueForest
map BlueForest, TILESET_NIHON_SNOWY, TOWN, LANDMARK_BLUE_FOREST, MUSIC_SINJOH_RUINS, TRUE, PALETTE_AUTO, FISHGROUP_SHORE

29
data/maps/outdoor_sprites.asm
View file

@ -39,6 +39,7 @@ OutdoorSprites:
dw SixIslandGroupSprites
dw SevenIslandGroupSprites
dw SilentHillsGroupSprites
dw OldCityGroupSprites
dw BlueForestGroupSprites
assert_table_length NUM_MAP_GROUPS
@ -717,3 +718,31 @@ SilentHillsGroupSprites:
; 2 non-walking sprites
db SPRITE_POKE_BALL
db SPRITE_FRUIT_TREE
OldCityGroupSprites:
; 12 non-walking filler sprites
db SPRITE_SUICUNE
db SPRITE_SILVER_TROPHY
db SPRITE_FAMICOM
db SPRITE_POKEDEX
db SPRITE_WILL
db SPRITE_ROCKER
db SPRITE_NURSE
db SPRITE_FISHER
db SPRITE_BIG_LAPRAS
db SPRITE_BIG_ONIX
db SPRITE_SUDOWOODO
db SPRITE_RIVAL
; 9 walking sprites
db SPRITE_GRAMPS
db SPRITE_TWIN
db SPRITE_BUG_CATCHER
db SPRITE_YOUNGSTER
db SPRITE_BEAUTY
db SPRITE_SUPER_NERD
db SPRITE_GRANNY
db SPRITE_MONSTER
; 2 non-walking sprites
db SPRITE_POKE_BALL
db SPRITE_FRUIT_TREE

3
data/maps/roofs.asm
View file

@ -47,7 +47,8 @@ MapGroupRoofs:
db ROOF_VIOLET ; 33 (Six Island)
db ROOF_VIOLET ; 34 (Seven Island)
db ROOF_NEW_BARK ; 35 (Silent Hills)
db ROOF_NEW_BARK ; 36 (Blue Forest)
db ROOF_VIOLET ; 36 (Old City)
db ROOF_NEW_BARK ; 37 (Blue Forest)
assert_table_length NUM_MAP_GROUPS + 1
Roofs:

6
data/maps/scripts.asm
View file

@ -578,8 +578,12 @@ INCLUDE "maps/WinnersPath.asm"
INCLUDE "maps/WinnersPathOutside.asm"
INCLUDE "maps/Route66.asm"
INCLUDE "maps/BlueLab.asm"
INCLUDE "maps/OldCity.asm"
INCLUDE "maps/OldCityPokecenter1F.asm"
INCLUDE "maps/OldMart.asm"
INCLUDE "maps/HoneyGrandmasHouse.asm"
SECTION "Map Scripts 30", ROMX
SECTION "Map Scripts 30", ROMX ; spillover
INCLUDE "maps/TanobyRuins.asm"
INCLUDE "maps/TanobyChambers.asm"
INCLUDE "maps/NavalRockExterior.asm"

1
data/maps/sgb_roof_pal_inds.asm
View file

@ -39,5 +39,6 @@ MapGroupRoofSGBPalInds:
db PREDEFPAL_SIX_ISLAND
db PREDEFPAL_SEVEN_ISLAND
db PREDEFPAL_SILENT_HILLS
db PREDEFPAL_ECRUTEAK
db PREDEFPAL_BLUE_FOREST
assert_table_length NUM_MAP_GROUPS + 1

1
data/maps/spawn_points.asm
View file

@ -40,6 +40,7 @@ SpawnPoints:
spawn FAST_SHIP_CABINS_SW_SSW_NW, 6, 2
spawn SILENT_HILLS, 13, 5
spawn OLD_CITY, 27, 29
spawn N_A, -1, -1

1
data/tilesets.asm
View file

@ -61,4 +61,5 @@ Tilesets::
tileset TilesetLavenderCrypt
tileset TilesetBlueLab
tileset TilesetNihonGate
tileset TilesetNihonMart
assert_table_length NUM_TILESETS + 1

BIN
data/tilesets/nihon_old_attributes.bin
View file

Binary file not shown.

64
data/tilesets/nihon_old_collision.asm
View file

@ -0,0 +1,64 @@
tilecoll WALL, WALL, WALL, WALL ; 00
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 02
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 03
tilecoll FLOOR, HEADBUTT_TREE, FLOOR, HEADBUTT_TREE ; 04
tilecoll WATER, WATER, WATER, WATER ; 05
tilecoll WATER, WATER, WATER, WATER ; 06
tilecoll WATER, WATER, WATER, WATER ; 07
tilecoll WATER, WATER, WATER, WATER ; 08
tilecoll WATER, WATER, WATER, WATER ; 09
tilecoll WATER, WATER, WATER, WATER ; 0a
tilecoll WATER, WATER, WATER, WATER ; 0b
tilecoll WATER, WATER, WATER, WATER ; 0c
tilecoll WALL, FLOOR, FLOOR, FLOOR ; 0d
tilecoll WALL, WALL, FLOOR, FLOOR ; 0e
tilecoll WALL, WALL, FLOOR, FLOOR ; 0f
tilecoll WALL, WALL, WALL, FLOOR ; 10
tilecoll FLOOR, WALL, FLOOR, WALL ; 11
tilecoll WALL, WALL, FLOOR, WALL ; 12
tilecoll FLOOR, WALL, WALL, WALL ; 13
tilecoll WALL, FLOOR, WALL, FLOOR ; 14
tilecoll FLOOR, FLOOR, WALL, FLOOR ; 15
tilecoll FLOOR, FLOOR, WALL, WALL ; 16
tilecoll HEADBUTT_TREE, CUT_TREE, FLOOR, FLOOR ; 17
tilecoll FLOOR, FLOOR, WALL, WALL ; 18
tilecoll WALL, WALL, WALL, WALL ; 19
tilecoll WALL, WALL, WALL, WALL ; 1a
tilecoll WALL, WALL, WALL, WALL ; 1b
tilecoll WALL, WALL, WALL, FLOOR ; 1c
tilecoll WALL, WALL, WALL, WALL ; 1d
tilecoll WALL, WALL, WALL, WALL ; 1e
tilecoll WALL, WALL, WALL, WALL ; 1f
tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 20
tilecoll WALL, WALL, WALL, WALL ; 21
tilecoll WALL, WALL, WALL, WALL ; 22
tilecoll DOOR, WALL, FLOOR, FLOOR ; 23
tilecoll WALL, WALL, FLOOR, FLOOR ; 24
tilecoll WALL, WALL, FLOOR, FLOOR ; 25
tilecoll WALL, WALL, FLOOR, FLOOR ; 26
tilecoll WALL, WALL, WALL, WALL ; 27
tilecoll WALL, WALL, WALL, WALL ; 28
tilecoll WALL, DOOR, FLOOR, FLOOR ; 29
tilecoll WALL, WALL, WALL, WALL ; 2a
tilecoll WALL, WALL, WALL, WALL ; 2b
tilecoll WALL, WALL, FLOOR, FLOOR ; 2c
tilecoll WALL, WALL, FLOOR, FLOOR ; 2d
tilecoll WALL, DOOR, FLOOR, FLOOR ; 2e
tilecoll WALL, WALL, WALL, WALL ; 2f
tilecoll WALL, WALL, WALL, WALL ; 30
tilecoll WALL, WALL, WALL, DOOR ; 31
tilecoll WALL, WALL, WALL, WALL ; 32
tilecoll WALL, WALL, WALL, WALL ; 33
tilecoll DOOR, DOOR, FLOOR, FLOOR ; 34
tilecoll WALL, WALL, WALL, WALL ; 35
tilecoll WALL, WALL, WALL, WALL ; 36
tilecoll WALL, WALL, WALL, WALL ; 37
tilecoll WALL, WALL, WALL, WALL ; 38
tilecoll WALL, WALL, WALL, WALL ; 39
tilecoll WALL, WALL, WALL, WALL ; 3a
tilecoll WALL, WALL, WALL, WALL ; 3b
tilecoll WALL, WALL, WALL, WALL ; 3c
tilecoll WALL, DOOR, FLOOR, FLOOR ; 3d
tilecoll DOOR, WALL, WALL, WALL ; 3e
tilecoll WALL, WALL, WALL, WALL ; 3f

BIN
data/tilesets/nihon_old_metatiles.bin
View file

Binary file not shown.

BIN
data/tilesets/nihonmart_attributes.bin Normal file
View file

Binary file not shown.

23
data/tilesets/nihonmart_collision.asm Normal file
View file

@ -0,0 +1,23 @@
tilecoll WALL, WALL, WALL, WALL ; 00
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 01
tilecoll WALL, FLOOR, WALL, FLOOR ; 02
tilecoll COUNTER, WALL, COUNTER, FLOOR ; 03
tilecoll COUNTER, FLOOR, COUNTER, FLOOR ; 04
tilecoll WALL, WALL, WALL, WALL ; 05
tilecoll WALL, FLOOR, WALL, FLOOR ; 06
tilecoll WALL, WALL, WALL, WALL ; 07
tilecoll WALL, WALL, WALL, WALL ; 08
tilecoll WALL, WALL, WALL, WALL ; 09
tilecoll WALL, WALL, FLOOR, FLOOR ; 0a
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0b
tilecoll FLOOR, FLOOR, FLOOR, FLOOR ; 0c
tilecoll FLOOR, FLOOR, WARP_CARPET_DOWN, WARP_CARPET_DOWN ; 0d
tilecoll FLOOR, FLOOR, WALL, WALL ; 0e
tilecoll WALL, WALL, FLOOR, FLOOR ; 0f
tilecoll FLOOR, FLOOR, WALL, WALL ; 10
tilecoll WALL, WALL, WALL, WALL ; 11
tilecoll WALL, WALL, FLOOR, FLOOR ; 12
tilecoll FLOOR, FLOOR, WALL, WALL ; 13
tilecoll FLOOR, FLOOR, WALL, WALL ; 14
tilecoll WALL, WALL, FLOOR, FLOOR ; 15
tilecoll WALL, WALL, FLOOR, FLOOR ; 16

BIN
data/tilesets/nihonmart_metatiles.bin Normal file
View file

Binary file not shown.

BIN
data/tilesets/traditional_house_attributes.bin
View file

Binary file not shown.

6
data/tilesets/traditional_house_collision.asm
View file

@ -56,9 +56,3 @@
tilecoll WALL, WALL, FLOOR, WALL ; 37
tilecoll FLOOR, FLOOR, FLOOR, WALL ; 38
tilecoll FLOOR, LADDER, FLOOR, FLOOR ; 39
tilecoll 04, 03, 03, 03 ; 3a
tilecoll 03, 03, 03, 03 ; 3b
tilecoll 03, 03, 04, 04 ; 3c
tilecoll 04, 04, 04, 04 ; 3d
tilecoll 03, 03, 03, 03 ; 3e
tilecoll WARP_CARPET_DOWN, 04, 03, 03 ; 3f

BIN
data/tilesets/traditional_house_metatiles.bin
View file

Binary file not shown.

1
engine/tilesets/tileset_anims.asm
View file

@ -320,6 +320,7 @@ TilesetMuseumAnim:
TilesetLavenderCryptAnim:
TilesetBlueLabAnim:
TilesetNihonGateAnim:
TilesetNihonMartAnim:
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation
dw NULL, WaitTileAnimation

1
gfx/sgb/predef.pal
View file

@ -32,6 +32,7 @@
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, 31,21,18, 15,20,31, 00,00,00 ; PREDEFPAL_OLD_CITY
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

12
gfx/tilesets.asm
View file

@ -612,3 +612,15 @@ INCBIN "data/tilesets/nihongate_metatiles.bin"
TilesetNihonGateColl::
INCLUDE "data/tilesets/nihongate_collision.asm"
TilesetNihonMartAttr::
INCBIN "data/tilesets/nihonmart_attributes.bin"
TilesetNihonMartGFX::
INCBIN "gfx/tilesets/nihonmart.2bpp.lz"
TilesetNihonMartMeta::
INCBIN "data/tilesets/nihonmart_metatiles.bin"
TilesetNihonMartColl::
INCLUDE "data/tilesets/nihonmart_collision.asm"

BIN
gfx/tilesets/nihonmart.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 909 B

8
gfx/tilesets/roofs.pal
View file

@ -134,7 +134,11 @@
; group 27 (Silent Hills)
RGB 09,31,23, 10,22,22 ; morn/day
RGB 03,15,17, 02,10,15 ; nite
; group 28 (Blue Forest)
; group 28 (Old City)
RGB 31,19,00, 27,10,05 ; morn/day
RGB 15,07,02, 11,04,02 ; nite
; group 29 (Blue Forest)
RGB 24,22,31, 18,14,31 ; morn/day
RGB 12,10,24, 08,03,23 ; nite

18
maps/#Placeholder.asm Normal file
View file

@ -0,0 +1,18 @@
object_const_def
Placeholder_MapScripts:
def_scene_scripts
def_callbacks
Placeholder_MapEvents:
db 0, 0 ; filler
def_warp_events
warp_event 0, 0, DEBUG_ROOM, 1
def_coord_events
def_bg_events
def_object_events

125
maps/DebugRoom.asm
View file

@ -198,129 +198,6 @@ DebugTextE:
line "many items!"
done
; Honey Tree script (to be put in Old City)
HoneyGrannyScript:
faceplayer
opentext
writetext .IntroText
waitbutton
checkitem HONEY_POT
iffalse .no_pot
checkflag ENGINE_SWEET_HONEY
iftrue .just_given
special CheckSweetHoneyTimer
ifequal 1, .waited_a_day
ifequal 2, .just_used
writetext .UsedHoneyText
.give_honey
setflag ENGINE_SWEET_HONEY
waitbutton
writetext .ReceivedSweetHoneyText
playsound SFX_ITEM
pause 60
waitbutton
writetext .TryUsingText
waitbutton
closetext
end
.just_used
writetext .DidYouPutText
waitbutton
closetext
end
.no_pot
writetext .NoPotText
waitbutton
verbosegiveitem HONEY_POT
writetext .AfterPotGivenText
sjump .give_honey
.just_given
writetext .TryUsingText
waitbutton
closetext
end
.waited_a_day
writetext .DidYouPutText2
waitbutton
closetext
end
.IntroText:
text "Hello, hello!"
line "I'm the HONEY"
cont "GRANDMA!"
done
.UsedHoneyText:
text "I see you have a"
line "HONEY POT with"
para "you. You can use"
line "it to collect"
cont "SWEET HONEY."
para "I know! I'll share"
line "some with you."
done
.ReceivedSweetHoneyText:
text "<PLAYER> received"
line "SWEET HONEY."
done
.DidYouPutText:
text "Did you put SWEET"
line "HONEY on a tree?"
para "It takes about a"
line "day for #MON to"
cont "be drawn to it."
done
.NoPotText:
text "You don't have a"
line "HONEY POT?"
para "Not to worry!"
line "I've got just the"
cont "thing for you."
done
.AfterPotGivenText:
text "A HONEY POT can"
line "store SWEET HONEY."
para "You can use it to"
line "attract rare wild"
cont "#MON."
para "In fact, I'll give"
line "you some to try"
cont "it out!"
done
.TryUsingText:
text "Try spreading some"
line "HONEY on a tree!"
done
.DidYouPutText2:
text "Did you put SWEET"
line "HONEY on a tree?"
para "What happened to"
line "it?"
done
DebugRoom_MapEvents:
db 0, 0 ; filler
@ -332,7 +209,7 @@ DebugRoom_MapEvents:
warp_event 15, 2, GOLDENROD_CITY, 1 ; city warp
warp_event 4, 9, PALLET_TOWN, 1 ; left lab/league warp
warp_event 5, 9, PALLET_TOWN, 1 ; right lab/league warp
warp_event 35, 17, BLUE_FOREST, 1 ; east warp
warp_event 35, 17, OLD_CITY, 1 ; east warp
warp_event 5, 35, BLUE_FOREST, 1 ; southwest warp
warp_event 19, 34, BLUE_FOREST, 1 ; southern warp
warp_event 33, 33, BLUE_FOREST, 1 ; southeast warp

2
maps/HoneyGrandmasHouse.ablk Normal file
View file

@ -0,0 +1,2 @@
)
*

144
maps/HoneyGrandmasHouse.asm Normal file
View file

@ -0,0 +1,144 @@
object_const_def
const HONEYGRANDMASHOUSE_GRANNY
HoneyGrandmasHouse_MapScripts:
def_scene_scripts
def_callbacks
; Honey Tree script
HoneyGrannyScript:
faceplayer
opentext
writetext .IntroText
waitbutton
checkitem HONEY_POT
iffalse .no_pot
checkflag ENGINE_SWEET_HONEY
iftrue .just_given
special CheckSweetHoneyTimer
ifequal 1, .waited_a_day
ifequal 2, .just_used
writetext .UsedHoneyText
.give_honey
setflag ENGINE_SWEET_HONEY
waitbutton
writetext .ReceivedSweetHoneyText
playsound SFX_ITEM
pause 60
waitbutton
writetext .TryUsingText
waitbutton
closetext
end
.just_used
writetext .DidYouPutText
waitbutton
closetext
end
.no_pot
writetext .NoPotText
waitbutton
verbosegiveitem HONEY_POT
writetext .AfterPotGivenText
sjump .give_honey
.just_given
writetext .TryUsingText
waitbutton
closetext
end
.waited_a_day
writetext .DidYouPutText2
waitbutton
closetext
end
.IntroText:
text "Hello, hello!"
line "I'm the HONEY"
cont "GRANDMA!"
done
.UsedHoneyText:
text "I see you have a"
line "HONEY POT with"
para "you. You can use"
line "it to collect"
cont "SWEET HONEY."
para "I know! I'll share"
line "some with you."
done
.ReceivedSweetHoneyText:
text "<PLAYER> received"
line "SWEET HONEY."
done
.DidYouPutText:
text "Did you put SWEET"
line "HONEY on a tree?"
para "It takes about a"
line "day for #MON to"
cont "be drawn to it."
done
.NoPotText:
text "You don't have a"
line "HONEY POT?"
para "Not to worry!"
line "I've got just the"
cont "thing for you."
done
.AfterPotGivenText:
text "A HONEY POT can"
line "store SWEET HONEY."
para "You can use it to"
line "attract rare wild"
cont "#MON."
para "In fact, I'll give"
line "you some to try"
cont "it out!"
done
.TryUsingText:
text "Try spreading some"
line "HONEY on a tree!"
done
.DidYouPutText2:
text "Did you put SWEET"
line "HONEY on a tree?"
para "What happened to"
line "it?"
done
HoneyGrandmasHouse_MapEvents:
db 0, 0 ; filler
def_warp_events
warp_event 3, 9, OLD_CITY, 11
warp_event 4, 9, OLD_CITY, 11
def_coord_events
def_bg_events
def_object_events
object_event 4, 5, SPRITE_GRANNY, SPRITEMOVEDATA_STANDING_RIGHT, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, HoneyGrannyScript, -1

2
maps/NihonMart.ablk Normal file
View file

@ -0,0 +1,2 @@

   

BIN
maps/OldCity.ablk Normal file
View file

Binary file not shown.

192
maps/OldCity.asm Normal file
View file

@ -0,0 +1,192 @@
object_const_def
const OLDCITY_FRUITTREE
const OLDCITY_GRAMPS
const OLDCITY_TWIN
const OLDCITY_BUGCATCHER
const OLDCITY_YOUNGSTER
const OLDCITY_SUPERNERD
const OLDCITY_GRANNY
const OLDCITY_MONSTER
OldCity_MapScripts:
def_scene_scripts
def_callbacks
callback MAPCALLBACK_NEWMAP, OldCityFlypointCallback
OldCityFlypointCallback:
setflag ENGINE_FLYPOINT_OLD
endcallback
HoneyGrandmaSignScript:
jumptext HoneyGrandmaSignText
HoneyGrandmaSignText:
text "HONEY GRANDMA's"
line "house"
done
OldCitySignScript:
jumptext OldCitySignText
OldCitySignText:
text "OLD CITY"
para "The city of gold-"
line "en leaves." ; doubles as a HGSS ref. maybe have a gold/silver leaf maniac somewhere idfk they're in the game and totally useless
done
GrowlitheTowerSignScript:
jumptext GrowlitheTowerSignText
; TODO: What are they doing in the tower? Probably something to do with Shi-Shi, but what?
GrowlitheTowerSignText:
text "GROWLITHE TOWER"
line "Comment to be"
cont "written."
done
OldCityMuseumSignScript:
jumptext OldCityMuseumSignText
OldCityMuseumSignText:
text "XX"
line "Comment to be"
cont "written."
done
OldCityFruitTree:
fruittree FRUITTREE_OLD_CITY
OldCityPokecenterSign:
jumpstd PokecenterSignScript
OldCityMartSign:
jumpstd MartSignScript
OldCityOldManScript:
jumptextfaceplayer OldCityOldManText
OldCityOldManText:
text "GROWLITHE TOWER"
line "is only open to"
cont "citizens."
para "We await a hero." ; or something like that.
done
OldCityTwinScript:
jumptextfaceplayer OldCityTwinText
OldCityTwinText:
text "Comment to be"
line "written."
done
OldCityBugCatcherScript:
jumptextfaceplayer OldCityBugCatcherText
OldCityBugCatcherText:
text "The HONEY GRANDMA"
line "helped me catch"
cont "a HERACROSS!"
para "I'm so happy! My"
line "friends are so"
cont "jealous!"
done
OldCityYoungsterScript:
jumptextfaceplayer OldCityYoungsterText
OldCityYoungsterText:
text "Did you come here"
line "through QUIET"
cont "CAVE?"
para "My friends go"
line "there to catch"
cont "bug #MON!"
done
OldCitySuperNerdScript:
jumptextfaceplayer OldCitySuperNerdText
OldCitySuperNerdText:
text "LARVITAR and I"
line "are on a journey!"
para "One day, it'll be"
line "big and strong!"
done
OldCityLarvitarScript:
faceplayer
opentext
writetext OldCityLarvitarText
cry LARVITAR
waitbutton
closetext
end
OldCityLarvitarText:
text "LARVITAR: Hwarg!"
line "Grr!"
done
OldCityGrannyScript:
jumptextfaceplayer OldCityGrannyText
OldCityGrannyText:
text "WALKER? He's from"
line "JOHTO. When he"
cont "left, his son"
cont "inherited the"
cont "GYM."
para "You beat him?"
para "Very good."
done
OldCity_MapEvents:
db 0, 0 ; filler
def_warp_events
warp_event 18, 31, ROUTE_49_OLD_CITY_GATE_1F, 3
warp_event 19, 31, ROUTE_49_OLD_CITY_GATE_1F, 4
warp_event 22, 26, DEBUG_ROOM, 1 ; Right-down house
warp_event 3, 26, OLD_MART, 1 ; Mart
warp_event 27, 12, DEBUG_ROOM, 1 ; gym right
warp_event 26, 12, DEBUG_ROOM, 1 ; gym left
warp_event 5, 12, DEBUG_ROOM, 1 ; Museum(?) right
warp_event 4, 12, DEBUG_ROOM, 1 ; Museum(?) left
warp_event 12, 16, DEBUG_ROOM, 1 ; Growlithe Tower right
warp_event 11, 16, DEBUG_ROOM, 1 ; Growlithe Tower left
warp_event 3, 31, HONEY_GRANDMAS_HOUSE, 1 ; southwest house (Honey Grandma)
warp_event 27, 28, OLD_CITY_POKECENTER_1F, 1 ; pokecenter
warp_event 30, 20, DEBUG_ROOM, 1 ; right-up house
warp_event 10, 26, DEBUG_ROOM, 1 ; house by mart
; considering a tearoom where the waiters are passive-aggressive. classic kyoto.
def_coord_events
def_bg_events
bg_event 20, 22, BGEVENT_READ, OldCitySignScript
bg_event 4, 32, BGEVENT_READ, HoneyGrandmaSignScript
bg_event 8, 14, BGEVENT_READ, GrowlitheTowerSignScript
bg_event 26, 20, BGEVENT_READ, OldCityMuseumSignScript
bg_event 28, 14, BGEVENT_READ, OldCityMuseumSignScript
bg_event 8, 11, BGEVENT_READ, OldCityMuseumSignScript
bg_event 28, 28, BGEVENT_READ, OldCityPokecenterSign
bg_event 4, 26, BGEVENT_READ, OldCityMartSign
def_object_events
object_event 24, 3, SPRITE_FRUIT_TREE, SPRITEMOVEDATA_STILL, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OldCityFruitTree, -1
object_event 9, 16, SPRITE_GRAMPS, SPRITEMOVEDATA_STANDING_DOWN, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OldCityOldManScript, -1
object_event 26, 22, SPRITE_TWIN, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OldCityTwinScript, -1
object_event 17, 16, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_STANDING_UP, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OldCityBugCatcherScript, -1
object_event 18, 24, SPRITE_YOUNGSTER, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OldCityYoungsterScript, -1
object_event 14, 21, SPRITE_SUPER_NERD, SPRITEMOVEDATA_STANDING_DOWN, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OldCitySuperNerdScript, -1
object_event 13, 26, SPRITE_GRANNY, SPRITEMOVEDATA_WANDER, 2, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OldCityGrannyScript, -1
object_event 15, 21, SPRITE_MONSTER, SPRITEMOVEDATA_STANDING_DOWN, 2, 2, -1, -1, PAL_NPC_GREEN, OBJECTTYPE_SCRIPT, 0, OldCityLarvitarScript, -1

66
maps/OldCityPokecenter1F.asm Normal file
View file

@ -0,0 +1,66 @@
object_const_def
const OLDCITYPOKECENTER1F_NURSE
const OLDCITYPOKECENTER1F_FISHER
const OLDCITYPOKECENTER1F_COOLTRAINER_M
const OLDCITYPOKECENTER1F_COOLTRAINER_F
OldCityPokecenter1F_MapScripts:
def_scene_scripts
def_callbacks
OldCityPokecenter1FNurseScript:
jumpstd PokecenterNurseScript
OldCityPokecenter1FCoolTrainerMScript:
jumptextfaceplayer OldCityPokecenter1FCoolTrainerMText
OldCityPokecenter1FCoolTrainerMText:
text "There's a strange"
line "house full of odd"
cont "geeks on ROUTE 50."
para "I wonder why? Is"
line "something going"
cont "on?"
done
OldCityPokecenter1FCoolTrainerFScript:
jumptextfaceplayer OldCityPokecenter1FCoolTrainerFText
OldCityPokecenter1FCoolTrainerFText:
text "WALKER is always"
line "riding on his"
cont "SKARMORY!"
para "The problem is, he"
line "doesn't leave time"
cont "for challengers…"
done
OldCityPokecenter1FFisherScript:
jumptextfaceplayer OldCityPokecenter1FFisherText
OldCityPokecenter1FFisherText:
text "I caught a strange"
line "fish #MON with"
cont "wings!"
done
OldCityPokecenter1F_MapEvents:
db 0, 0 ; filler
def_warp_events
warp_event 3, 7, OLD_CITY, 12
warp_event 4, 7, OLD_CITY, 12
warp_event 0, 7, NIHON_POKECENTER_2F, 1
def_coord_events
def_bg_events
def_object_events
object_event 5, 1, SPRITE_NURSE, SPRITEMOVEDATA_STANDING_DOWN, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OldCityPokecenter1FNurseScript, -1
object_event 13, 3, SPRITE_FISHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 0, 1, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OldCityPokecenter1FFisherScript, -1
object_event 1, 4, SPRITE_COOLTRAINER_F, SPRITEMOVEDATA_WANDER, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OldCityPokecenter1FCoolTrainerFScript, -1
object_event 7, 5, SPRITE_COOLTRAINER_M, SPRITEMOVEDATA_WANDER, 1, 2, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OldCityPokecenter1FCoolTrainerMScript, -1

54
maps/OldMart.asm Normal file
View file

@ -0,0 +1,54 @@
object_const_def
const OLDMART_CLERK
const OLDMART_TWIN
const OLDMART_BUG_CATCHER
OldMart_MapScripts:
def_scene_scripts
def_callbacks
OldMartClerkScript:
opentext
pokemart MARTTYPE_STANDARD, MART_OLDCITY
closetext
end
OldMartTwinScript:
jumptextfaceplayer OldMartTwinText
OldMartBugCatcherScript:
jumptextfaceplayer OldMartBugCatcherText
OldMartTwinText:
text "I'm buying MAIL"
line "to send to my"
cont "foreign friend!"
done
OldMartBugCatcherText:
text "I heard there's a"
line "tree with GOLD"
cont "BERRIES around"
cont "here."
para "If I go to JOHTO's"
line "BATTLE TOWER, they"
cont "could be useful!"
done
OldMart_MapEvents:
db 0, 0 ; filler
def_warp_events
warp_event 4, 7, OLD_CITY, 4
warp_event 5, 7, OLD_CITY, 4
def_coord_events
def_bg_events
def_object_events
object_event 1, 2, SPRITE_CLERK, SPRITEMOVEDATA_STANDING_RIGHT, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OldMartClerkScript, -1
object_event 15, 2, SPRITE_TWIN, SPRITEMOVEDATA_STANDING_UP, 0, 0, -1, -1, 0, OBJECTTYPE_SCRIPT, 0, OldMartTwinScript, -1
object_event 9, 5, SPRITE_BUG_CATCHER, SPRITEMOVEDATA_WALK_LEFT_RIGHT, 2, 0, -1, -1, PAL_NPC_RED, OBJECTTYPE_SCRIPT, 0, OldMartBugCatcherScript, -1

4
maps/Route49OldCityGate1F.asm
View file

@ -57,8 +57,8 @@ Route49OldCityGate1F_MapEvents:
def_warp_events
warp_event 4, 7, ROUTE_49_2, 3
warp_event 5, 7, ROUTE_49_2, 4
warp_event 4, 0, DEBUG_ROOM, 1 ; OLD_CITY
warp_event 5, 0, DEBUG_ROOM, 1 ; OLD_CITY
warp_event 4, 0, OLD_CITY, 1
warp_event 5, 0, OLD_CITY, 2
warp_event 1, 0, ROUTE_49_OLD_CITY_GATE_2F, 1
def_coord_events

2
maps/SilentHillsPokecenter1F.asm
View file

@ -52,7 +52,7 @@ SilentHillsPokecenter1FHoundoomScript:
end
SilentHillsPokecenter1FHoundoomText:
text "Bark! Bark!"
text "HOUNDOOM: Grr…"
done