thorn/jep-hack
1
0
Fork 0
mirror of https://github.com/thornAvery/jep-hack.git synced 2025-09-17 02:30:50 +12:00
Code Issues Actions Packages Projects Releases Wiki Activity

Ruddy Town!

Browse source 
we're probably going to need to split bank 2 eventually I am running out of unreferenced code to comment out lol
This commit is contained in:
Zeta_Null 2024-11-07 16:55:20 -05:00
parent 4aaf325c76
commit 9a80501cd1
23 changed files with 95 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
constants/engine_flags.asm
View file

@ -109,6 +109,7 @@
const ENGINE_FLYPOINT_OLD const ENGINE_FLYPOINT_OLD
const ENGINE_FLYPOINT_SAVOY const ENGINE_FLYPOINT_SAVOY
const ENGINE_FLYPOINT_CORAL const ENGINE_FLYPOINT_CORAL
const ENGINE_FLYPOINT_RUDDY
const ENGINE_FLYPOINT_UNUSED const ENGINE_FLYPOINT_UNUSED
; wLuckyNumberShowFlag ; wLuckyNumberShowFlag
const ENGINE_LUCKY_NUMBER_SHOW const ENGINE_LUCKY_NUMBER_SHOW

1
constants/landmark_constants.asm
View file

@ -141,6 +141,7 @@ DEF NIHON_LANDMARK EQU const_value
const LANDMARK_CORAL_CITY const LANDMARK_CORAL_CITY
const LANDMARK_ROUTE_51 const LANDMARK_ROUTE_51
const LANDMARK_ROUTE_52 const LANDMARK_ROUTE_52
const LANDMARK_RUDDY_TOWN
const LANDMARK_BLUE_FOREST const LANDMARK_BLUE_FOREST
const LANDMARK_ROUTE_66 const LANDMARK_ROUTE_66
const LANDMARK_WHITE_CITY const LANDMARK_WHITE_CITY

10
constants/map_constants.asm
View file

@ -679,13 +679,17 @@ ENDM
map_const ROUTE_52, 10, 27 ; 3 map_const ROUTE_52, 10, 27 ; 3
endgroup endgroup
newgroup BLUE_FOREST ; 39 newgroup RUDDY_TOWN ; 39
map_const RUDDY_TOWN, 20, 18 ; 1
endgroup
newgroup BLUE_FOREST ; 40
map_const BLUE_FOREST, 20, 18 ; 1 map_const BLUE_FOREST, 20, 18 ; 1
endgroup endgroup
newgroup WHITE_CITY ; 40 newgroup WHITE_CITY ; 41
map_const WHITE_CITY, 30, 27 ; 1 map_const WHITE_CITY, 30, 27 ; 1
map_const ROUTE_66_WHITE_CITY_GATE, 5, 4 ; 2 map_const ROUTE_66_WHITE_CITY_GATE, 5, 4 ; 2
endgroup endgroup
DEF NUM_MAP_GROUPS EQU const_value ; 40 DEF NUM_MAP_GROUPS EQU const_value ; 41

2
constants/map_data_constants.asm
View file

@ -117,6 +117,7 @@ DEF NUM_FISHGROUPS EQU const_value - 1
const SPAWN_OLD_CITY const SPAWN_OLD_CITY
const SPAWN_SAVOY_CITY const SPAWN_SAVOY_CITY
const SPAWN_CORAL_CITY const SPAWN_CORAL_CITY
const SPAWN_RUDDY_TOWN
DEF NUM_SPAWNS EQU const_value DEF NUM_SPAWNS EQU const_value
DEF SPAWN_N_A EQU -1 DEF SPAWN_N_A EQU -1
@ -165,6 +166,7 @@ DEF NIHON_FLYPOINT EQU const_value
const FLY_OLD_CITY const FLY_OLD_CITY
const FLY_SAVOY_CITY const FLY_SAVOY_CITY
const FLY_CORAL_CITY const FLY_CORAL_CITY
const FLY_RUDDY_TOWN
DEF NUM_FLYPOINTS EQU const_value DEF NUM_FLYPOINTS EQU const_value
DEF MAX_OUTDOOR_SPRITES EQU 23 ; see engine/overworld/overworld.asm DEF MAX_OUTDOOR_SPRITES EQU 23 ; see engine/overworld/overworld.asm

2
constants/scgb_constants.asm
View file

@ -182,6 +182,8 @@ DEF SCGB_DEFAULT EQU $ff
const PREDEFPAL_WHITE_CITY_MORN const PREDEFPAL_WHITE_CITY_MORN
const PREDEFPAL_ROUTES_NIHON_MORN const PREDEFPAL_ROUTES_NIHON_MORN
const PREDEFPAL_GATES_NIHON_MORN const PREDEFPAL_GATES_NIHON_MORN
const PREDEFPAL_RUDDY_TOWN
const PREDEFPAL_RUDDY_TOWN_MORN
DEF NUM_PREDEF_PALS EQU const_value DEF NUM_PREDEF_PALS EQU const_value
; SGB system command codes ; SGB system command codes

1
data/events/engine_flags.asm
View file

@ -119,6 +119,7 @@ EngineFlags:
engine_flag wVisitedSpawns, SPAWN_OLD_CITY engine_flag wVisitedSpawns, SPAWN_OLD_CITY
engine_flag wVisitedSpawns, SPAWN_SAVOY_CITY engine_flag wVisitedSpawns, SPAWN_SAVOY_CITY
engine_flag wVisitedSpawns, SPAWN_CORAL_CITY engine_flag wVisitedSpawns, SPAWN_CORAL_CITY
engine_flag wVisitedSpawns, SPAWN_RUDDY_TOWN
engine_flag wVisitedSpawns, NUM_SPAWNS ; unused engine_flag wVisitedSpawns, NUM_SPAWNS ; unused
engine_flag wLuckyNumberShowFlag, LUCKYNUMBERSHOW_GAME_OVER_F engine_flag wLuckyNumberShowFlag, LUCKYNUMBERSHOW_GAME_OVER_F

2
data/maps/attributes.asm
View file

@ -904,6 +904,8 @@ ENDM
map_attributes Route52, ROUTE_52, $6C, EAST map_attributes Route52, ROUTE_52, $6C, EAST
connection east, Route51, ROUTE_51, 18 connection east, Route51, ROUTE_51, 18
map_attributes RuddyTown, RUDDY_TOWN, $04, 0
map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later. map_attributes BlueForest, BLUE_FOREST, $00, 0 ; this is on its own for now. add connections later.
map_attributes WhiteCity, WHITE_CITY, $01, 0 ; this is on its own for now. add connections later. map_attributes WhiteCity, WHITE_CITY, $01, 0 ; this is on its own for now. add connections later.

3
data/maps/blocks.asm
View file

@ -1322,3 +1322,6 @@ Route51_Blocks:
Route52_Blocks: Route52_Blocks:
INCBIN "maps/Route52.ablk" INCBIN "maps/Route52.ablk"
RuddyTown_Blocks:
INCBIN "maps/RuddyTown.ablk"

1
data/maps/flypoints.asm
View file

@ -41,4 +41,5 @@ Flypoints:
db LANDMARK_OLD_CITY, SPAWN_OLD_CITY db LANDMARK_OLD_CITY, SPAWN_OLD_CITY
db LANDMARK_SAVOY_CITY, SPAWN_SAVOY_CITY db LANDMARK_SAVOY_CITY, SPAWN_SAVOY_CITY
db LANDMARK_CORAL_CITY, SPAWN_CORAL_CITY db LANDMARK_CORAL_CITY, SPAWN_CORAL_CITY
db LANDMARK_RUDDY_TOWN, SPAWN_RUDDY_TOWN
db -1 ; end db -1 ; end

2
data/maps/landmarks.asm
View file

@ -145,6 +145,7 @@ Landmarks:
landmark 36, 92, CoralCityName landmark 36, 92, CoralCityName
landmark 24, 92, Route52Name landmark 24, 92, Route52Name
landmark 12, 84, Route53Name landmark 12, 84, Route53Name
landmark 12, 68, RuddyTownName
landmark 140, 60, BlueForestName landmark 140, 60, BlueForestName
landmark 108, 108, Route66Name landmark 108, 108, Route66Name
landmark 124, 108, WhiteCityName landmark 124, 108, WhiteCityName
@ -276,5 +277,6 @@ OldCityName: db "SEPIA¯CITY@"
PokemonPagodaName: db "#MON¯PAGODA@" PokemonPagodaName: db "#MON¯PAGODA@"
SavoyCityName: db "SAVOY¯CITY@" SavoyCityName: db "SAVOY¯CITY@"
CoralCityName: db "CORAL¯CITY@" CoralCityName: db "CORAL¯CITY@"
RuddyTownName: db "RUDDY¯TOWN@"
BlueForestName: db "BLUE¯FOREST@" BlueForestName: db "BLUE¯FOREST@"
WhiteCityName: db "WHITE¯CITY@" WhiteCityName: db "WHITE¯CITY@"

10
data/maps/maps.asm
View file

@ -55,8 +55,9 @@ MapGroupPointers::
dw MapGroup_OldCity ; 36 dw MapGroup_OldCity ; 36
dw MapGroup_SavoyCity ; 37 dw MapGroup_SavoyCity ; 37
dw MapGroup_CoralCity ; 38 dw MapGroup_CoralCity ; 38
dw MapGroup_BlueForest ; 39 dw MapGroup_RuddyTown ; 39
dw MapGroup_WhiteCity ; 40 dw MapGroup_BlueForest ; 40
dw MapGroup_WhiteCity ; 41
assert_table_length NUM_MAP_GROUPS assert_table_length NUM_MAP_GROUPS
MapGroup_Olivine: MapGroup_Olivine:
@ -743,6 +744,11 @@ MapGroup_CoralCity:
map Route52, TILESET_NIHON_HIGHTECH, ROUTE, LANDMARK_ROUTE_52, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map Route52, TILESET_NIHON_HIGHTECH, ROUTE, LANDMARK_ROUTE_52, MUSIC_LAKE_OF_RAGE, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
assert_table_length NUM_CORAL_CITY_MAPS assert_table_length NUM_CORAL_CITY_MAPS
MapGroup_RuddyTown:
table_width MAP_LENGTH, MapGroup_RuddyTown
map RuddyTown, TILESET_NIHON_SOUTH, TOWN, LANDMARK_RUDDY_TOWN, MUSIC_VERMILION_CITY, FALSE, PALETTE_AUTO, FISHGROUP_SHORE
assert_table_length NUM_RUDDY_TOWN_MAPS
MapGroup_BlueForest: MapGroup_BlueForest:
table_width MAP_LENGTH, MapGroup_BlueForest table_width MAP_LENGTH, MapGroup_BlueForest
map BlueForest, TILESET_NIHON_SNOWY, TOWN, LANDMARK_BLUE_FOREST, MUSIC_SINJOH_RUINS, FALSE, PALETTE_AUTO, FISHGROUP_SHORE map BlueForest, TILESET_NIHON_SNOWY, TOWN, LANDMARK_BLUE_FOREST, MUSIC_SINJOH_RUINS, FALSE, PALETTE_AUTO, FISHGROUP_SHORE

2
data/maps/outdoor_sprites.asm
View file

@ -42,6 +42,7 @@ OutdoorSprites:
dw OldCityGroupSprites dw OldCityGroupSprites
dw SavoyCityGroupSprites dw SavoyCityGroupSprites
dw CoralCityGroupSprites dw CoralCityGroupSprites
dw RuddyTownGroupSprites
dw BlueForestGroupSprites dw BlueForestGroupSprites
dw WhiteCityGroupSprites dw WhiteCityGroupSprites
assert_table_length NUM_MAP_GROUPS assert_table_length NUM_MAP_GROUPS
@ -333,6 +334,7 @@ IndigoGroupSprites:
BlueForestGroupSprites: ; Will have its own thing eventually BlueForestGroupSprites: ; Will have its own thing eventually
WhiteCityGroupSprites: ; Ditto WhiteCityGroupSprites: ; Ditto
RuddyTownGroupSprites: ; Ditto
NewBarkGroupSprites: NewBarkGroupSprites:
db SPRITE_SUICUNE db SPRITE_SUICUNE
db SPRITE_SILVER_TROPHY db SPRITE_SILVER_TROPHY

5
data/maps/roofs.asm
View file

@ -50,8 +50,9 @@ MapGroupRoofs:
db ROOF_VIOLET ; 36 (Old City) db ROOF_VIOLET ; 36 (Old City)
db ROOF_NEW_BARK ; 37 (Savoy City) db ROOF_NEW_BARK ; 37 (Savoy City)
db ROOF_NEW_BARK ; 38 (Coral City) db ROOF_NEW_BARK ; 38 (Coral City)
db ROOF_NEW_BARK ; 39 (Blue Forest) db ROOF_NEW_BARK ; 38 (Ruddy Town)
db ROOF_NEW_BARK ; 40 (White City) db ROOF_NEW_BARK ; 40 (Blue Forest)
db ROOF_NEW_BARK ; 41 (White City)
assert_table_length NUM_MAP_GROUPS + 1 assert_table_length NUM_MAP_GROUPS + 1
Roofs: Roofs:

3
data/maps/scripts.asm
View file

@ -637,4 +637,5 @@ INCLUDE "maps/SavoyCity.asm"
INCLUDE "maps/Route50SavoyCityGate.asm" INCLUDE "maps/Route50SavoyCityGate.asm"
INCLUDE "maps/CoralCity.asm" INCLUDE "maps/CoralCity.asm"
INCLUDE "maps/Route51.asm" INCLUDE "maps/Route51.asm"
INCLUDE "maps/Route52.asm" INCLUDE "maps/Route52.asm"
INCLUDE "maps/RuddyTown.asm"

2
data/maps/sgb_roof_pal_inds.asm
View file

@ -42,6 +42,7 @@ MapGroupRoofSGBPalInds:
db PREDEFPAL_OLD_CITY db PREDEFPAL_OLD_CITY
db PREDEFPAL_SAVOY_CITY db PREDEFPAL_SAVOY_CITY
db PREDEFPAL_CORAL_CITY db PREDEFPAL_CORAL_CITY
db PREDEFPAL_RUDDY_TOWN
db PREDEFPAL_BLUE_FOREST db PREDEFPAL_BLUE_FOREST
db PREDEFPAL_WHITE_CITY db PREDEFPAL_WHITE_CITY
assert_table_length NUM_MAP_GROUPS + 1 assert_table_length NUM_MAP_GROUPS + 1
@ -88,6 +89,7 @@ MapGroupRoofSGBPalIndsMorn:
db PREDEFPAL_OLD_CITY_MORN db PREDEFPAL_OLD_CITY_MORN
db PREDEFPAL_SAVOY_CITY_MORN db PREDEFPAL_SAVOY_CITY_MORN
db PREDEFPAL_CORAL_CITY_MORN db PREDEFPAL_CORAL_CITY_MORN
db PREDEFPAL_RUDDY_TOWN_MORN
db PREDEFPAL_BLUE_FOREST_MORN db PREDEFPAL_BLUE_FOREST_MORN
db PREDEFPAL_WHITE_CITY_MORN db PREDEFPAL_WHITE_CITY_MORN
assert_table_length NUM_MAP_GROUPS + 1 assert_table_length NUM_MAP_GROUPS + 1

1
data/maps/spawn_points.asm
View file

@ -51,6 +51,7 @@ SpawnPoints:
spawn OLD_CITY, 27, 29 spawn OLD_CITY, 27, 29
spawn SAVOY_CITY, 25, 15 spawn SAVOY_CITY, 25, 15
spawn CORAL_CITY, 31, 11 spawn CORAL_CITY, 31, 11
spawn RUDDY_TOWN, 35, 15
spawn N_A, -1, -1 spawn N_A, -1, -1

6
data/tilesets/nihon_south_collision.asm
View file

@ -12,8 +12,8 @@
tilecoll WALL, WALL, FLOOR, FLOOR ; 0b tilecoll WALL, WALL, FLOOR, FLOOR ; 0b
tilecoll FLOOR, WALL, WALL, WALL ; 0c tilecoll FLOOR, WALL, WALL, WALL ; 0c
tilecoll WARP_CARPET_DOWN, WARP_CARPET_DOWN, WALL, WALL ; 0d tilecoll WARP_CARPET_DOWN, WARP_CARPET_DOWN, WALL, WALL ; 0d
tilecoll FLOOR, FLOOR, WALL, WALL ; 0e tilecoll WALL, FLOOR, WALL, WALL ; 0e
tilecoll WALL, WALL, WALL, WALL ; 0f tilecoll WALL, WALL, WALL, DOOR ; 0f
tilecoll WALL, WALL, WALL, WALL ; 10 tilecoll WALL, WALL, WALL, WALL ; 10
tilecoll WALL, WALL, WALL, WALL ; 11 tilecoll WALL, WALL, WALL, WALL ; 11
tilecoll WALL, WALL, WALL, WALL ; 12 tilecoll WALL, WALL, WALL, WALL ; 12
@ -58,7 +58,7 @@
tilecoll WALL, WALL, FLOOR, WALL ; 39 tilecoll WALL, WALL, FLOOR, WALL ; 39
tilecoll WATER, WATER, WATER, WATER ; 3a tilecoll WATER, WATER, WATER, WATER ; 3a
tilecoll WATER, WATER, WATER, WATER ; 3b tilecoll WATER, WATER, WATER, WATER ; 3b
tilecoll WALL, FLOOR, WALL, WALL ; 3c tilecoll WALL, FLOOR, WALL, FLOOR ; 3c
tilecoll WALL, WALL, WALL, WALL ; 3d tilecoll WALL, WALL, WALL, WALL ; 3d
tilecoll WALL, WALL, WALL, WALL ; 3e tilecoll WALL, WALL, WALL, WALL ; 3e
tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3f tilecoll FLOOR, FLOOR, WALL, FLOOR ; 3f

26
engine/gfx/color.asm
View file

@ -955,19 +955,19 @@ _InitSGBBorderPals:
dw DataSndPacket7 dw DataSndPacket7
dw DataSndPacket8 dw DataSndPacket8
UpdateSGBBorder: ; unreferenced ;UpdateSGBBorder: ; unreferenced
di ; di
xor a ; xor a
ldh [rJOYP], a ; ldh [rJOYP], a
ld hl, MaskEnFreezePacket ; ld hl, MaskEnFreezePacket
call _PushSGBPals ; call _PushSGBPals
call PushSGBBorder ; call PushSGBBorder
call SGBDelayCycles ; call SGBDelayCycles
call SGB_ClearVRAM ; call SGB_ClearVRAM
ld hl, MaskEnCancelPacket ; ld hl, MaskEnCancelPacket
call _PushSGBPals ; call _PushSGBPals
ei ; ei
ret ; ret
PushSGBBorder: PushSGBBorder:
call .LoadSGBBorderPointers call .LoadSGBBorderPointers

3
gfx/sgb/predef.pal
View file

@ -134,4 +134,5 @@
RGB 31,31,31, 27,26,25, 12,15,20, 00,00,00 ; PREDEFPAL_WHITE_CITY_MORN RGB 31,31,31, 27,26,25, 12,15,20, 00,00,00 ; PREDEFPAL_WHITE_CITY_MORN
RGB 31,31,31, 21,21,16, 12,15,20, 00,00,00 ; PREDEFPAL_ROUTES_NIHON_MORN RGB 31,31,31, 21,21,16, 12,15,20, 00,00,00 ; PREDEFPAL_ROUTES_NIHON_MORN
RGB 31,31,31, 16,16,16, 12,15,20, 00,00,00 ; PREDEFPAL_GATES_NIHON_MORN RGB 31,31,31, 16,16,16, 12,15,20, 00,00,00 ; PREDEFPAL_GATES_NIHON_MORN
RGB 31,31,31, 26,10,06, 15,20,20, 00,00,00 ; PREDEFPAL_RUDDY_TOWN
RGB 31,31,31, 23,09,04, 12,15,20, 00,00,00 ; PREDEFPAL_RUDDY_TOWN_MORN #

8
gfx/tilesets/roofs.pal
View file

@ -146,11 +146,15 @@
; group 30 (Coral City) ; group 30 (Coral City)
RGB 31,14,20, 27,05,16 ; morn/day RGB 31,14,20, 27,05,16 ; morn/day
RGB 14,03,17, 09,03,12 ; nite RGB 14,03,17, 09,03,12 ; nite
; group 31 (Ruddy Town)
RGB 28,08,05, 20,09,02 ; morn/day
RGB 14,07,08, 12,02,04 ; nite
; group 31 (Blue Forest) ; group 32 (Blue Forest)
RGB 24,22,31, 18,14,31 ; morn/day RGB 24,22,31, 18,14,31 ; morn/day
RGB 12,10,24, 08,03,23 ; nite RGB 12,10,24, 08,03,23 ; nite
; group 32 (White City) ; group 33 (White City)
RGB 27,28,31, 24,24,26 ; morn/day RGB 27,28,31, 24,24,26 ; morn/day
RGB 13,12,24, 11,09,22 ; nite RGB 13,12,24, 11,09,22 ; nite

4
maps/Route52.asm
View file

@ -9,7 +9,9 @@ Route52_MapEvents:
db 0, 0 ; filler db 0, 0 ; filler
def_warp_events def_warp_events
warp_event 8, 9, RUDDY_TOWN, 1
warp_event 9, 9, RUDDY_TOWN, 2
def_coord_events def_coord_events
def_bg_events def_bg_events

6
maps/RuddyTown.ablk
View file

@ -1,3 +1,3 @@
,@--A.,-0112-O((((0145B612NNNNNN=//?1H/>((L'''P((<11+C317P+//?11H3#:;(+/C3:KG;I''J ,@--A.,-0112-O((((0145B612NNNNNN=//?1H/>((L'''P((<11+C317P+//?11H3#:;(+/C3:KG;I''J
ME$%&& ()**' ME$%&&& ()***'
!!!!!!"  !!!!!!" 

25
maps/RuddyTown.asm Normal file
View file

@ -0,0 +1,25 @@
object_const_def
RuddyTown_MapScripts:
def_scene_scripts
def_callbacks
callback MAPCALLBACK_NEWMAP, .Flypoint
.Flypoint:
setflag ENGINE_FLYPOINT_RUDDY
return
RuddyTown_MapEvents:
db 0, 0 ; filler
def_warp_events
warp_event 28, 30, ROUTE_52, 1
warp_event 29, 30, ROUTE_52, 2
def_coord_events
def_bg_events
def_object_events