Skip to content

Commit

Permalink
Upstream remaining style fixes from dev-fenhl branch
Browse files Browse the repository at this point in the history
  • Loading branch information
fenhl committed Nov 1, 2023
1 parent c23896c commit d4f0ba2
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Rom.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ def read_rom(self, input_file: str, output_file: Optional[str] = None, verify_cr
if rom_crc not in valid_crc:
# Bad CRC validation
raise RuntimeError(f'ROM file {input_file} is not a valid OoT 1.0 US ROM.')
elif len(self.buffer) < 0x2000000 or len(self.buffer) > 0x4000000 or file_name[1].lower() not in ['.z64', '.n64']:
elif len(self.buffer) < 0x2000000 or len(self.buffer) > 0x4000000 or file_name[1].lower() not in ('.z64', '.n64'):
# ROM is too big, or too small, or a bad type
raise RuntimeError(f'ROM file {input_file} is not a valid OoT 1.0 US ROM.')
elif len(self.buffer) == 0x2000000:
Expand Down
6 changes: 3 additions & 3 deletions SettingsList.py
Original file line number Diff line number Diff line change
Expand Up @@ -2798,17 +2798,17 @@ class SettingInfos:
''',
default = 'off',
choices = {
'off': 'Off',
'off': 'Off',
'vanilla': 'Vanilla Behavior',
'easy': 'Easier Behavior'
'easy': 'Easier Behavior',
},
shared = True,
gui_params = {
'randomize_key': 'randomize_settings',
'distribution': [
('off', 1),
('vanilla', 1),
('easy', 1)
('easy', 1),
],
},
)
Expand Down

0 comments on commit d4f0ba2

Please sign in to comment.