Merge branch 'inverted_flut' into main
This commit is contained in:
		
						commit
						87d5a481f9
					
				
							
								
								
									
										9
									
								
								Rom.py
								
								
								
								
							
							
						
						
									
										9
									
								
								Rom.py
								
								
								
								
							| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
from __future__ import annotations
 | 
			
		||||
 | 
			
		||||
JAP10HASH = '03a63945398191337e896e5771f77173'
 | 
			
		||||
RANDOMIZERBASEHASH = '5fef983a09ae2fe83ea633a37dea224c'
 | 
			
		||||
RANDOMIZERBASEHASH = '9e27514e0655659f1d07364c35da7852'
 | 
			
		||||
 | 
			
		||||
import io
 | 
			
		||||
import json
 | 
			
		||||
| 
						 | 
				
			
			@ -1950,6 +1950,9 @@ def write_strings(rom, world, player, team):
 | 
			
		|||
        tt['kakariko_flophouse_man_no_flippers'] = 'I really hate mowing my yard.\n{PAGEBREAK}\nI should move.'
 | 
			
		||||
        tt['kakariko_flophouse_man'] = 'I really hate mowing my yard.\n{PAGEBREAK}\nI should move.'
 | 
			
		||||
 | 
			
		||||
    if world.mode[player] == 'inverted':
 | 
			
		||||
        tt['sign_village_of_outcasts'] = 'attention\nferal ducks sighted\nhiding in statues\n\nflute players beware\n'
 | 
			
		||||
 | 
			
		||||
    def hint_text(dest, ped_hint=False):
 | 
			
		||||
        if not dest:
 | 
			
		||||
            return "nothing"
 | 
			
		||||
| 
						 | 
				
			
			@ -2312,6 +2315,10 @@ def set_inverted_mode(world, player, rom):
 | 
			
		|||
    rom.write_byte(snes_to_pc(0x05AF79), 0xF0)
 | 
			
		||||
    rom.write_byte(snes_to_pc(0x0DB3C5), 0xC6)
 | 
			
		||||
    rom.write_byte(snes_to_pc(0x07A3F4), 0xF0)  # duck
 | 
			
		||||
    rom.write_byte(0xDC21D, 0x6B)  # inverted mode flute activation (skip weathervane overlay)
 | 
			
		||||
    rom.write_bytes(0x48DB3, [0xF8, 0x01])  # inverted mode (bird X)
 | 
			
		||||
    rom.write_byte(0x48D5E, 0x01)  # inverted mode (rock X)
 | 
			
		||||
    rom.write_bytes(0x48CC1+36, bytes([0xF8]*12)) # (rock X)
 | 
			
		||||
    rom.write_int16s(snes_to_pc(0x02E849),
 | 
			
		||||
                     [0x0043, 0x0056, 0x0058, 0x006C, 0x006F, 0x0070, 0x007B, 0x007F, 0x001B])  # dw flute
 | 
			
		||||
    rom.write_int16(snes_to_pc(0x02E8D5), 0x07C8)
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
										
											Binary file not shown.
										
									
								
							
		Loading…
	
		Reference in New Issue