Skip to content

2MB ROM #36

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tcprescott wants to merge 6 commits into
base: master
Choose a base branch
from
Open

2MB ROM #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7525adc
assembly changes for 2MB rom by Zarby
tcprescott Sep 13, 2020
ee2e84d
the rest of the changes by Zarby
tcprescott Sep 13, 2020
b381aea
player sprite is still corrupt, but everyone else works
tcprescott Sep 13, 2020
05a6613
more changes
tcprescott Sep 13, 2020
d483da3
fix flag constants
tcprescott Sep 13, 2020
e2341b2
remove SetCharacterSelectScreenVersion
tcprescott Sep 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 23 additions & 23 deletions Assembly/exported_symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
EnemizerTablesStart = $408000
EnemizerCodeStart = $4094f5
sprite_bush_spawn_table_overworld = $408120
sprite_bush_spawn_table_dungeons = $408248
sprite_bush_spawn_table_random_sprites = $408370
EnemizerFlags = $408100
EnemizerFlags_randomize_bushes = $408100
EnemizerFlags_close_blind_door = $408101
EnemizerFlags_moldorm_eye_count = $408102
EnemizerFlags_randomize_sprites = $408103
EnemizerFlags_agahnim_fun_balls = $408104
EnemizerFlags_enable_mimic_override = $408105
EnemizerFlags_enable_terrorpin_ai_fix = $408106
room_header_table = $408375
enemizer_info_table = $408000
moved_room_header_bank_value_address = $408374
modified_room_object_table = $40b84a
DMAKholdstare = $4095a5
swordgfx = $409b62
shieldgfx = $40ab62
Spawn_Bees = $40b7ee
notItemSprite_Mimic = $409af7
sprite_bush_spawn_item_table = $409525
EnemizerTablesStart = $368000
EnemizerCodeStart = $3694f5
sprite_bush_spawn_table_overworld = $368120
sprite_bush_spawn_table_dungeons = $368248
sprite_bush_spawn_table_random_sprites = $368370
EnemizerFlags = $368100
EnemizerFlags_randomize_bushes = $368100
EnemizerFlags_close_blind_door = $368101
EnemizerFlags_moldorm_eye_count = $368102
EnemizerFlags_randomize_sprites = $368103
EnemizerFlags_agahnim_fun_balls = $368104
EnemizerFlags_enable_mimic_override = $368105
EnemizerFlags_enable_terrorpin_ai_fix = $368106
room_header_table = $368375
enemizer_info_table = $368000
moved_room_header_bank_value_address = $368374
modified_room_object_table = $36b77f
DMAKholdstare = $3695a5
swordgfx = $369ace
shieldgfx = $36aace
Spawn_Bees = $36b75a
notItemSprite_Mimic = $369a63
sprite_bush_spawn_item_table = $369525
23 changes: 23 additions & 0 deletions Assembly/exported_symbols.txtUndefined
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
EnemizerTablesStart = $368000
EnemizerCodeStart = $3694f5
sprite_bush_spawn_table_overworld = $368120
sprite_bush_spawn_table_dungeons = $368248
sprite_bush_spawn_table_random_sprites = $368370
EnemizerFlags = $368100
EnemizerFlags_randomize_bushes = $368100
EnemizerFlags_close_blind_door = $368101
EnemizerFlags_moldorm_eye_count = $368102
EnemizerFlags_randomize_sprites = $368103
EnemizerFlags_agahnim_fun_balls = $368104
EnemizerFlags_enable_mimic_override = $368105
EnemizerFlags_enable_terrorpin_ai_fix = $368106
room_header_table = $368375
enemizer_info_table = $368000
moved_room_header_bank_value_address = $368374
modified_room_object_table = $36b813
DMAKholdstare = $3695a5
swordgfx = $369b62
shieldgfx = $36ab62
Spawn_Bees = $36b7ee
notItemSprite_Mimic = $369af7
sprite_bush_spawn_item_table = $369525
4 changes: 2 additions & 2 deletions Assembly/hooks.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ incsrc bosses_hooks.asm

incsrc moldorm_hooks.asm

incsrc sprite_randomizer_hooks.asm
;incsrc sprite_randomizer_hooks.asm

incsrc kodongo_hooks.asm

Expand All @@ -41,4 +41,4 @@ incsrc bee_hooks.asm

incsrc vitreous_hooks.asm

incsrc agahnim_hooks.asm
;incsrc agahnim_hooks.asm
30 changes: 15 additions & 15 deletions Assembly/main.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,21 +7,21 @@ lorom
!BLT = "BCC"
!BGE = "BCS"

org $00FFD7 ; Set rom on 2mb
db #$0C
; org $00FFD7 ; Set rom on 2mb
; db #$0C

org $5FFFFF ; write at the last position to expand on 2mb
db #$00
; org $3FFFFF ; write at the last position to expand on 2mb
; db #$00

;=Constants======================================================================

!BUSHES_FLAG = "$408100"
!BLIND_DOOR_FLAG = "$408101"
!MOLDORM_EYES_FLAG = "$408102"
!RANDOM_SPRITE_FLAG = "$408103"
!AGAHNIM_FUN_BALLS = "$408104"
!ENABLE_MIMIC_OVERRIDE = "$408105"
!ENABLE_TERRORPIN_AI_FIX = "$408106"
!BUSHES_FLAG = "$368100"
!BLIND_DOOR_FLAG = "$368101"
!MOLDORM_EYES_FLAG = "$368102"
!RANDOM_SPRITE_FLAG = "$368103"
!AGAHNIM_FUN_BALLS = "$368104"
!ENABLE_MIMIC_OVERRIDE = "$368105"
!ENABLE_TERRORPIN_AI_FIX = "$368106"

; Enemizer reserved memory
; $7F50B0 - $7F50BF - Downstream Reserved (Enemizer)
Expand All @@ -35,7 +35,7 @@ incsrc DMA.asm
incsrc externalhooks.asm ; this is from z3randomizer source. be sure to check for updates

;================================================================================
org $408000
org $368000
EnemizerTablesStart:
incsrc enemizer_info_table.asm
incsrc enemizerflags.asm
Expand All @@ -54,7 +54,7 @@ incsrc bosses_moved.asm
incsrc damage.asm
incsrc bossdrop.asm
incsrc moldorm.asm
incsrc sprite_randomizer.asm
;incsrc sprite_randomizer.asm
incsrc kodongo_fixes.asm
incsrc mimic_fixes.asm
;incsrc location_menu.asm
Expand All @@ -64,12 +64,12 @@ incsrc sword_and_shield.asm
incsrc overworld_sprites.asm
incsrc bees.asm
incsrc vitreous_fixes.asm
incsrc agahnim.asm
;incsrc agahnim.asm

; data
incsrc room_object_table.asm
incsrc shell_gfx.asm
warnpc $40FFFF ;if we hit this we need to split stuff by bank
warnpc $36FFFF ;if we hit this we need to split stuff by bank
;================================================================================

incsrc export_symbols.asm
Expand Down
2 changes: 1 addition & 1 deletion Assembly/patchData.json
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Assembly/patchData.jsonUndefined
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Assembly/room_header_table.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
moved_room_header_bank_value_address:
db #$40 ; use above to index to this
db #$36 ; use above to index to this

room_header_table:
skip #$1180
Expand Down
46 changes: 23 additions & 23 deletions BasePatchGenerator/exported_symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
EnemizerTablesStart = $408000
EnemizerCodeStart = $4094f5
sprite_bush_spawn_table_overworld = $408120
sprite_bush_spawn_table_dungeons = $408248
sprite_bush_spawn_table_random_sprites = $408370
EnemizerFlags = $408100
EnemizerFlags_randomize_bushes = $408100
EnemizerFlags_close_blind_door = $408101
EnemizerFlags_moldorm_eye_count = $408102
EnemizerFlags_randomize_sprites = $408103
EnemizerFlags_agahnim_fun_balls = $408104
EnemizerFlags_enable_mimic_override = $408105
EnemizerFlags_enable_terrorpin_ai_fix = $408106
room_header_table = $408375
enemizer_info_table = $408000
moved_room_header_bank_value_address = $408374
modified_room_object_table = $40b84a
DMAKholdstare = $4095a5
swordgfx = $409b62
shieldgfx = $40ab62
Spawn_Bees = $40b7ee
notItemSprite_Mimic = $409af7
sprite_bush_spawn_item_table = $409525
EnemizerTablesStart = $368000
EnemizerCodeStart = $3694f5
sprite_bush_spawn_table_overworld = $368120
sprite_bush_spawn_table_dungeons = $368248
sprite_bush_spawn_table_random_sprites = $368370
EnemizerFlags = $368100
EnemizerFlags_randomize_bushes = $368100
EnemizerFlags_close_blind_door = $368101
EnemizerFlags_moldorm_eye_count = $368102
EnemizerFlags_randomize_sprites = $368103
EnemizerFlags_agahnim_fun_balls = $368104
EnemizerFlags_enable_mimic_override = $368105
EnemizerFlags_enable_terrorpin_ai_fix = $368106
room_header_table = $368375
enemizer_info_table = $368000
moved_room_header_bank_value_address = $368374
modified_room_object_table = $36b77f
DMAKholdstare = $3695a5
swordgfx = $369ace
shieldgfx = $36aace
Spawn_Bees = $36b75a
notItemSprite_Mimic = $369a63
sprite_bush_spawn_item_table = $369525
2 changes: 1 addition & 1 deletion BasePatchGenerator/patchData.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion EnemizerCLI.Core/enemizerBasePatch.json
View file
Open in desktop

Large diffs are not rendered by default.

46 changes: 23 additions & 23 deletions EnemizerCLI.Core/exported_symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
EnemizerTablesStart = $408000
EnemizerCodeStart = $4094f5
sprite_bush_spawn_table_overworld = $408120
sprite_bush_spawn_table_dungeons = $408248
sprite_bush_spawn_table_random_sprites = $408370
EnemizerFlags = $408100
EnemizerFlags_randomize_bushes = $408100
EnemizerFlags_close_blind_door = $408101
EnemizerFlags_moldorm_eye_count = $408102
EnemizerFlags_randomize_sprites = $408103
EnemizerFlags_agahnim_fun_balls = $408104
EnemizerFlags_enable_mimic_override = $408105
EnemizerFlags_enable_terrorpin_ai_fix = $408106
room_header_table = $408375
enemizer_info_table = $408000
moved_room_header_bank_value_address = $408374
modified_room_object_table = $40b84a
DMAKholdstare = $4095a5
swordgfx = $409b62
shieldgfx = $40ab62
Spawn_Bees = $40b7ee
notItemSprite_Mimic = $409af7
sprite_bush_spawn_item_table = $409525
EnemizerTablesStart = $368000
EnemizerCodeStart = $3694f5
sprite_bush_spawn_table_overworld = $368120
sprite_bush_spawn_table_dungeons = $368248
sprite_bush_spawn_table_random_sprites = $368370
EnemizerFlags = $368100
EnemizerFlags_randomize_bushes = $368100
EnemizerFlags_close_blind_door = $368101
EnemizerFlags_moldorm_eye_count = $368102
EnemizerFlags_randomize_sprites = $368103
EnemizerFlags_agahnim_fun_balls = $368104
EnemizerFlags_enable_mimic_override = $368105
EnemizerFlags_enable_terrorpin_ai_fix = $368106
room_header_table = $368375
enemizer_info_table = $368000
moved_room_header_bank_value_address = $368374
modified_room_object_table = $36b77f
DMAKholdstare = $3695a5
swordgfx = $369ace
shieldgfx = $36aace
Spawn_Bees = $36b75a
notItemSprite_Mimic = $369a63
sprite_bush_spawn_item_table = $369525
2 changes: 1 addition & 1 deletion EnemizerCLI.Core/patchData.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion EnemizerCLI/enemizerBasePatch.json
View file
Open in desktop

Large diffs are not rendered by default.

42 changes: 23 additions & 19 deletions EnemizerCLI/exported_symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,23 @@
EnemizerTablesStart = $408000
EnemizerCodeStart = $4094f5
sprite_bush_spawn_table_overworld = $408120
sprite_bush_spawn_table_dungeons = $408248
sprite_bush_spawn_table_random_sprites = $408370
EnemizerFlags = $408100
EnemizerFlags_randomize_bushes = $408100
EnemizerFlags_close_blind_door = $408101
EnemizerFlags_moldorm_eye_count = $408102
EnemizerFlags_randomize_sprites = $408103
room_header_table = $408375
enemizer_info_table = $408000
moved_room_header_bank_value_address = $408374
modified_room_object_table = $40b8af
DMAKholdstare = $4095a5
swordgfx = $409bfe
shieldgfx = $40abfe
Spawn_Bees = $40b88a
notItemSprite_Mimic = $409aa7
EnemizerTablesStart = $368000
EnemizerCodeStart = $3694f5
sprite_bush_spawn_table_overworld = $368120
sprite_bush_spawn_table_dungeons = $368248
sprite_bush_spawn_table_random_sprites = $368370
EnemizerFlags = $368100
EnemizerFlags_randomize_bushes = $368100
EnemizerFlags_close_blind_door = $368101
EnemizerFlags_moldorm_eye_count = $368102
EnemizerFlags_randomize_sprites = $368103
EnemizerFlags_agahnim_fun_balls = $368104
EnemizerFlags_enable_mimic_override = $368105
EnemizerFlags_enable_terrorpin_ai_fix = $368106
room_header_table = $368375
enemizer_info_table = $368000
moved_room_header_bank_value_address = $368374
modified_room_object_table = $36b813
DMAKholdstare = $3695a5
swordgfx = $369b62
shieldgfx = $36ab62
Spawn_Bees = $36b7ee
notItemSprite_Mimic = $369af7
sprite_bush_spawn_item_table = $369525
2 changes: 1 addition & 1 deletion EnemizerCLI/patchData.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion EnemizerGui/enemizerBasePatch.json
View file
Open in desktop

Large diffs are not rendered by default.

46 changes: 23 additions & 23 deletions EnemizerGui/exported_symbols.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
EnemizerTablesStart = $408000
EnemizerCodeStart = $4094f5
sprite_bush_spawn_table_overworld = $408120
sprite_bush_spawn_table_dungeons = $408248
sprite_bush_spawn_table_random_sprites = $408370
EnemizerFlags = $408100
EnemizerFlags_randomize_bushes = $408100
EnemizerFlags_close_blind_door = $408101
EnemizerFlags_moldorm_eye_count = $408102
EnemizerFlags_randomize_sprites = $408103
EnemizerFlags_agahnim_fun_balls = $408104
EnemizerFlags_enable_mimic_override = $408105
EnemizerFlags_enable_terrorpin_ai_fix = $408106
room_header_table = $408375
enemizer_info_table = $408000
moved_room_header_bank_value_address = $408374
modified_room_object_table = $40b84a
DMAKholdstare = $4095a5
swordgfx = $409b62
shieldgfx = $40ab62
Spawn_Bees = $40b7ee
notItemSprite_Mimic = $409af7
sprite_bush_spawn_item_table = $409525
EnemizerTablesStart = $368000
EnemizerCodeStart = $3694f5
sprite_bush_spawn_table_overworld = $368120
sprite_bush_spawn_table_dungeons = $368248
sprite_bush_spawn_table_random_sprites = $368370
EnemizerFlags = $368100
EnemizerFlags_randomize_bushes = $368100
EnemizerFlags_close_blind_door = $368101
EnemizerFlags_moldorm_eye_count = $368102
EnemizerFlags_randomize_sprites = $368103
EnemizerFlags_agahnim_fun_balls = $368104
EnemizerFlags_enable_mimic_override = $368105
EnemizerFlags_enable_terrorpin_ai_fix = $368106
room_header_table = $368375
enemizer_info_table = $368000
moved_room_header_bank_value_address = $368374
modified_room_object_table = $36b77f
DMAKholdstare = $3695a5
swordgfx = $369ace
shieldgfx = $36aace
Spawn_Bees = $36b75a
notItemSprite_Mimic = $369a63
sprite_bush_spawn_item_table = $369525
2 changes: 1 addition & 1 deletion EnemizerGui/patchData.json
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions EnemizerLibrary/Constants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,13 @@ public class AddressConstants
public const int OverworldSpritePointerTableBaseAddress = 0x04C901;

public const int MoldormEyeCountAddressVanilla = 0x0EDBB3;
public const int MoldormEyeCountAddressEnemizer = 0x200102;
public const int MoldormEyeCountAddressEnemizer = 0x1B0102;

public const int NewBossGraphicsBaseAddress = 0x2F8000;
public const int NewBossGraphicsBaseAddress = 0x1B0000;

public const int RandomSpriteGraphicsBaseAddress = 0x300000;

public const int EnemizerFileLength = 0x400000;
public const int EnemizerFileLength = 0x200000;

public const int HiddenEnemyChancePoolBaseAddress = 0xD7BBB;

Expand Down
2 changes: 1 addition & 1 deletion EnemizerLibrary/EnemizerLibrary.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>netstandard2.0</TargetFramework>
<Version>6.1.0.126</Version>
<Version>6.1.0.180</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion EnemizerLibrary/Randomization.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public RomData MakeRandomization(string basePath, int seed, OptionFlags optionfl
seed = ResetEnemizerRom();
}
this.ROM_DATA.ExpandRom();
this.ROM_DATA.SetCharacterSelectScreenVersion();
// this.ROM_DATA.SetCharacterSelectScreenVersion();
this.ROM_DATA.EnemizerSeed = seed;
this.ROM_DATA.SetRomInfoOptionFlags(this.optionFlags);

Expand Down
2 changes: 1 addition & 1 deletion EnemizerTests/enemizerBasePatch.json
View file
Open in desktop

Large diffs are not rendered by default.

Loading