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

Nihon + Silent Hills Groundwork

Browse source 
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:
Llinos Evans 2023-10-20 06:23:47 +01:00
parent 26bb9fbc7b
commit a8546f60c9
22 changed files with 155 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
constants/engine_flags.asm
View file

@ -89,6 +89,7 @@
const ENGINE_FLYPOINT_LAKE_OF_RAGE
const ENGINE_FLYPOINT_BLACKTHORN
const ENGINE_FLYPOINT_SILVER_CAVE
const ENGINE_FLYPOINT_SILENT_HILLS
const ENGINE_FLYPOINT_UNUSED
; wLuckyNumberShowFlag
const ENGINE_LUCKY_NUMBER_SHOW

3
constants/landmark_constants.asm
View file

@ -98,6 +98,8 @@ DEF KANTO_LANDMARK EQU const_value
const LANDMARK_TOHJO_FALLS ; 5d
const LANDMARK_ROUTE_28 ; 5e
const LANDMARK_FAST_SHIP ; 5f
DEF NIHON_LANDMARK EQU const_value
const LANDMARK_SILENT_HILLS
DEF NUM_LANDMARKS EQU const_value
; used in CaughtData
@ -109,4 +111,5 @@ DEF NUM_LANDMARKS EQU const_value
const_def
const JOHTO_REGION ; 0
const KANTO_REGION ; 1
const NIHON_REGION ; 2
DEF NUM_REGIONS EQU const_value

8
constants/map_constants.asm
View file

@ -500,5 +500,9 @@ ENDM
map_const MR_POKEMONS_HOUSE, 4, 4 ; 10
map_const ROUTE_31_VIOLET_GATE, 5, 4 ; 11
endgroup
DEF NUM_MAP_GROUPS EQU const_value ; 26
newgroup SILENT_HILLS ; 27
map_const SILENT_HILLS, 10, 10 ; 1
endgroup
DEF NUM_MAP_GROUPS EQU const_value ; 27

4
constants/map_data_constants.asm
View file

@ -102,6 +102,8 @@ DEF NUM_FISHGROUPS EQU const_value - 1
const SPAWN_BLACKTHORN
const SPAWN_MT_SILVER
const SPAWN_FAST_SHIP
; nihon
const SPAWN_SILENT_HILLS
DEF NUM_SPAWNS EQU const_value
DEF SPAWN_N_A EQU -1
@ -136,6 +138,8 @@ DEF KANTO_FLYPOINT EQU const_value
const FLY_FUCHSIA
const FLY_CINNABAR
const FLY_INDIGO
DEF NIHON_FLYPOINT EQU const_value
const FLY_SILENT_HILLS
DEF NUM_FLYPOINTS EQU const_value
DEF MAX_OUTDOOR_SPRITES EQU 23 ; see engine/overworld/overworld.asm