10 Commits

Author SHA1 Message Date
be35ed4451 Update baserom 2026-02-08 00:33:43 -06:00
0a18bda341 Update baserom 2026-02-07 23:53:17 -06:00
1e2097c3dc Update baserom 2026-02-07 21:23:53 -06:00
f4e6308a5d Enemy shuffle working 2026-02-07 18:13:47 -06:00
2738f61c0d Update baserom 2026-02-07 16:52:00 -06:00
b189de00c6 Update baserom 2026-02-07 14:18:11 -06:00
f3dd0319ed Merge branch 'beta' into pikit 2026-02-03 17:48:52 -06:00
b1a71ef9b1 Merge in OW Shuffle 0.7.0.2 (#3)
Reviewed-on: #3
2026-02-03 23:47:48 +00:00
699d395b3d Update texts 2026-02-03 17:46:18 -06:00
077ba85e9d Update baserom 2026-02-03 17:45:20 -06:00
5 changed files with 3 additions and 4 deletions

2
Rom.py
View File

@@ -85,7 +85,7 @@ from Utils import int16_as_bytes, int32_as_bytes, local_path, snes_to_pc
from Versions import DRVersion, GKVersion, ORVersion from Versions import DRVersion, GKVersion, ORVersion
JAP10HASH = '03a63945398191337e896e5771f77173' JAP10HASH = '03a63945398191337e896e5771f77173'
RANDOMIZERBASEHASH = '42862d2936d47c8b6cfb355306d521b1' RANDOMIZERBASEHASH = '73c9cdaf56b3ec65eb95d5cfce1bbcee'
class JsonRom(object): class JsonRom(object):

View File

@@ -389,7 +389,6 @@ DeathMountain_texts = [
] ]
LostWoods_texts = [ LostWoods_texts = [
'thieves\' stump', 'thieves\' stump',
'He\'s got wood',
] * 2 + [ ] * 2 + [
"the forest thief", "the forest thief",
"dancing pickles", "dancing pickles",

Binary file not shown.

View File

@@ -1998,7 +1998,7 @@ def init_vanilla_sprites():
create_sprite(0x0103, EnemySprite.Drunkard, 0x00, 0, 0x06, 0x15) create_sprite(0x0103, EnemySprite.Drunkard, 0x00, 0, 0x06, 0x15)
create_sprite(0x0103, EnemySprite.AdultNpc, 0x00, 0, 0x0a, 0x1b) create_sprite(0x0103, EnemySprite.AdultNpc, 0x00, 0, 0x0a, 0x1b)
create_sprite(0x0103, EnemySprite.Innkeeper, 0x00, 0, 0x17, 0x17) create_sprite(0x0103, EnemySprite.Innkeeper, 0x00, 0, 0x17, 0x17)
create_sprite(0x0104, EnemySprite.Pikit, 0x00, 0, 0x1a, 0x18) create_sprite(0x0104, EnemySprite.Pikit, 0x00, 0, 0x1a, 0x18, never_drop=True, fix=True)
create_sprite(0x0105, EnemySprite.Wiseman, 0x00, 0, 0x07, 0x18) create_sprite(0x0105, EnemySprite.Wiseman, 0x00, 0, 0x07, 0x18)
create_sprite(0x0106, EnemySprite.Shopkeeper, 0x00, 0, 0x08, 0x1b) create_sprite(0x0106, EnemySprite.Shopkeeper, 0x00, 0, 0x08, 0x1b)
create_sprite(0x0107, EnemySprite.BonkItem, 0x00, 0, 0x03, 0x15) create_sprite(0x0107, EnemySprite.BonkItem, 0x00, 0, 0x03, 0x15)

View File

@@ -566,7 +566,7 @@ def setup_required_dungeon_groups(sheets, data_tables):
sheets[did(5)].add_sprite_to_sheet([75, 77, 74, 90], {0xf3, 0xff, 0x109, 0x10e, 0x10f, 0x110, 0x111, 0x112, sheets[did(5)].add_sprite_to_sheet([75, 77, 74, 90], {0xf3, 0xff, 0x109, 0x10e, 0x10f, 0x110, 0x111, 0x112,
0x11a, 0x11c, 0x11f, 0x122}) 0x11a, 0x11c, 0x11f, 0x122})
sheets[did(7)].add_sprite_to_sheet([75, 77, 57, 54], {0x8, 0x2c, 0x114, 0x115, 0x116}) # big fairies sheets[did(7)].add_sprite_to_sheet([75, 77, 57, 54], {0x8, 0x2c, 0x114, 0x115, 0x116}) # big fairies
sheets[did(13)].add_sprite_to_sheet([81, None, None, None], {0x55, 0x102, 0x104}) # uncle, sick kid sheets[did(13)].add_sprite_to_sheet([81, None, None, 27], {0x55, 0x102, 0x104}) # uncle, sick kid
sheets[did(14)].add_sprite_to_sheet([71, 73, 76, 80], {0x12, 0x105, 0x10a}) # wisemen sheets[did(14)].add_sprite_to_sheet([71, 73, 76, 80], {0x12, 0x105, 0x10a}) # wisemen
sheets[did(15)].add_sprite_to_sheet([79, 77, 74, 80], {0xf4, 0xf5, 0x101, 0x103, 0x106, 0x118, 0x119}) # more npcs sheets[did(15)].add_sprite_to_sheet([79, 77, 74, 80], {0xf4, 0xf5, 0x101, 0x103, 0x106, 0x118, 0x119}) # more npcs
sheets[did(18)].add_sprite_to_sheet([85, 61, 66, 67], {0x20, 0x30}) # aga alter, aga1 sheets[did(18)].add_sprite_to_sheet([85, 61, 66, 67], {0x20, 0x30}) # aga alter, aga1