mirror of
https://github.com/thornAvery/jep-hack.git
synced 2026-02-06 16:15:24 +13:00
Nihon + Silent Hills Groundwork
Currently doesn't build due to a weird error
```
rgbasm -hL -Q8 -P includes.asm -Weverything -Wnumeric-string=2 -Wtruncation=1 -o data/maps/map_data.o data/maps/map_data.asm
error: data/maps/map_data.asm(3) -> data/maps/maps.asm(544) -> macros/asserts.as
m::assert_table_length(14):
Expected constant expression: 'NUM_SILENT_HILLS_MAP' is not constant at asse
mbly time
error: data/maps/map_data.asm(3) -> data/maps/maps.asm(544) -> macros/asserts.as
m::assert_table_length(16):
Assertion failed: MapGroup_SilentHills: expected 0 entries, each 9 bytes
error: Assembly aborted (2 errors)!
make: *** [Makefile:119: data/maps/map_data.o] Error 1
```
This commit is contained in:
parent
26bb9fbc7b
commit
a8546f60c9
22 changed files with 155 additions and 4 deletions
|
|
@ -99,6 +99,7 @@ EngineFlags:
|
|||
engine_flag wVisitedSpawns, SPAWN_LAKE_OF_RAGE
|
||||
engine_flag wVisitedSpawns, SPAWN_BLACKTHORN
|
||||
engine_flag wVisitedSpawns, SPAWN_MT_SILVER
|
||||
engine_flag wVisitedSpawns, SPAWN_SILENT_HILLS
|
||||
engine_flag wVisitedSpawns, NUM_SPAWNS ; unused
|
||||
|
||||
engine_flag wLuckyNumberShowFlag, LUCKYNUMBERSHOW_GAME_OVER_F
|
||||
|
|
|
|||
|
|
@ -695,3 +695,4 @@ ENDM
|
|||
map_attributes Route30BerryHouse, ROUTE_30_BERRY_HOUSE, $00, 0
|
||||
map_attributes MrPokemonsHouse, MR_POKEMONS_HOUSE, $00, 0
|
||||
map_attributes Route31VioletGate, ROUTE_31_VIOLET_GATE, $00, 0
|
||||
map_attributes SilentHills, SILENT_HILLS, $00, 0 ; this is on its own for now. add connections to mt. silver later.
|
||||
|
|
|
|||
|
|
@ -1045,3 +1045,6 @@ BetaBlank_Blocks: ; unreferenced
|
|||
|
||||
GoldenrodDeptStoreRoof_Blocks:
|
||||
INCBIN "maps/GoldenrodDeptStoreRoof.ablk"
|
||||
|
||||
SilentHills_Blocks:
|
||||
INCBIN "maps/SilentHills.ablk"
|
||||
|
|
|
|||
|
|
@ -27,4 +27,6 @@ Flypoints:
|
|||
db LANDMARK_FUCHSIA_CITY, SPAWN_FUCHSIA
|
||||
db LANDMARK_CINNABAR_ISLAND, SPAWN_CINNABAR
|
||||
db LANDMARK_INDIGO_PLATEAU, SPAWN_INDIGO
|
||||
; Nihon
|
||||
db LANDMARK_SILENT_HILLS, SPAWN_SILENT_HILLS
|
||||
db -1 ; end
|
||||
|
|
|
|||
|
|
@ -104,6 +104,8 @@ Landmarks:
|
|||
landmark 12, 100, TohjoFallsName
|
||||
landmark 20, 68, Route28Name
|
||||
landmark 140, 116, FastShipName
|
||||
assert_table_length NIHON_LANDMARK
|
||||
landmark 100, 116, SilentHillsName
|
||||
assert_table_length NUM_LANDMARKS
|
||||
|
||||
NewBarkTownName: db "NEW BARK¯TOWN@"
|
||||
|
|
@ -208,3 +210,4 @@ TohjoFallsName: db "TOHJO FALLS@"
|
|||
UndergroundName: db "UNDERGROUND@"
|
||||
BattleTowerName: db "BATTLE¯TOWER@"
|
||||
SpecialMapName: db "SPECIAL@"
|
||||
SilentHillsName: db "SILENT HILLS@"
|
||||
|
|
|
|||
|
|
@ -43,6 +43,7 @@ MapGroupPointers::
|
|||
dw MapGroup_NewBark ; 24
|
||||
dw MapGroup_Saffron ; 25
|
||||
dw MapGroup_Cherrygrove ; 26
|
||||
dw MapGroup_SilentHills ; 27
|
||||
assert_table_length NUM_MAP_GROUPS
|
||||
|
||||
MapGroup_Olivine:
|
||||
|
|
@ -536,3 +537,8 @@ MapGroup_Cherrygrove:
|
|||
map MrPokemonsHouse, TILESET_FACILITY, INDOOR, LANDMARK_ROUTE_30, MUSIC_CHERRYGROVE_CITY, FALSE, PALETTE_DAY, FISHGROUP_SHORE
|
||||
map Route31VioletGate, TILESET_GATE, GATE, LANDMARK_ROUTE_31, MUSIC_ROUTE_30, FALSE, PALETTE_DAY, FISHGROUP_SHORE
|
||||
assert_table_length NUM_CHERRYGROVE_MAPS
|
||||
|
||||
MapGroup_SilentHills:
|
||||
table_width MAP_LENGTH, MapGroup_SilentHills
|
||||
map SilentHills, TILESET_JOHTO, TOWN, LANDMARK_SILENT_HILLS, MUSIC_NEW_BARK_TOWN, TRUE, PALETTE_AUTO, FISHGROUP_SHORE
|
||||
assert_table_length NUM_SILENT_HILLS_MAP
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ OutdoorSprites:
|
|||
dw NewBarkGroupSprites
|
||||
dw SaffronGroupSprites
|
||||
dw CherrygroveGroupSprites
|
||||
dw SilentHillsGroupSprites
|
||||
assert_table_length NUM_MAP_GROUPS
|
||||
|
||||
PalletGroupSprites:
|
||||
|
|
@ -307,6 +308,7 @@ IndigoGroupSprites:
|
|||
db SPRITE_POKE_BALL
|
||||
db SPRITE_BOULDER
|
||||
|
||||
SilentHillsGroupSprites: ; Will have its own thing eventually
|
||||
NewBarkGroupSprites:
|
||||
db SPRITE_SUICUNE
|
||||
db SPRITE_SILVER_TROPHY
|
||||
|
|
|
|||
|
|
@ -38,6 +38,7 @@ MapGroupRoofs:
|
|||
db ROOF_NEW_BARK ; 24 (New Bark)
|
||||
db -1 ; 25
|
||||
db ROOF_NEW_BARK ; 26 (Cherrygrove)
|
||||
db ROOF_NEW_BARK ; 27 (Silent Hills)
|
||||
assert_table_length NUM_MAP_GROUPS + 1
|
||||
|
||||
Roofs:
|
||||
|
|
|
|||
|
|
@ -484,3 +484,4 @@ SECTION "Map Scripts 25", ROMX
|
|||
|
||||
INCLUDE "maps/SilverCaveOutside.asm"
|
||||
INCLUDE "maps/Route10North.asm"
|
||||
INCLUDE "maps/SilentHills.asm"
|
||||
|
|
|
|||
|
|
@ -30,4 +30,5 @@ MapGroupRoofSGBPalInds:
|
|||
db PREDEFPAL_NEW_BARK
|
||||
db PREDEFPAL_SAFFRON
|
||||
db PREDEFPAL_CHERRYGROVE
|
||||
db PREDEFPAL_SILENT_HILLS
|
||||
assert_table_length NUM_MAP_GROUPS + 1
|
||||
|
|
|
|||
|
|
@ -38,7 +38,9 @@ SpawnPoints:
|
|||
spawn BLACKTHORN_CITY, 21, 30
|
||||
spawn SILVER_CAVE_OUTSIDE, 23, 20
|
||||
spawn FAST_SHIP_CABINS_SW_SSW_NW, 6, 2
|
||||
|
||||
|
||||
spawn SILENT_HILLS, 10, 10
|
||||
|
||||
spawn N_A, -1, -1
|
||||
|
||||
assert_table_length NUM_SPAWNS + 1
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue