diff options
| author | Anghelo Carvajal <angheloalf95@gmail.com> | 2023-04-18 18:54:32 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-04-18 18:54:32 -0400 |
| commit | 3c107cb148d784e2af4a347dc78f25b1697410be (patch) | |
| tree | b67a051ee5851deec190356461b7575507c33785 /tools/weekeventregconvert.py | |
| parent | b8af819165ea4f31f34940d59a13ef19a5aabd2f (diff) | |
Add `SaveInfo` substruct to `SaveContext` (#1191)
* SaveInfo
* fix accesses in sram_NES.c
* some more fixing
* more fixes
* format
* fix unk
* namefixer
* format
* bss
* review
* weekeventregconvert
* namefixer
* bss
Diffstat (limited to 'tools/weekeventregconvert.py')
| -rwxr-xr-x | tools/weekeventregconvert.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/weekeventregconvert.py b/tools/weekeventregconvert.py index 02a3e4a42..071907058 100755 --- a/tools/weekeventregconvert.py +++ b/tools/weekeventregconvert.py @@ -843,20 +843,20 @@ def applyChange(fileContents: str, compiledRegex: re.Pattern, callback) -> str: def updateCheck(fileContents: str) -> str: - # gSaveContext.save.weekEventReg[86] & 2 - checkRegex = re.compile(rf"gSaveContext.save.weekEventReg\[(?P<index>{NUMBER_PATTERN})\]\s*\&\s*(?P<mask>{NUMBER_PATTERN})") + # gSaveContext.save.saveInfo.weekEventReg[86] & 2 + checkRegex = re.compile(rf"gSaveContext.save.saveInfo.weekEventReg\[(?P<index>{NUMBER_PATTERN})\]\s*\&\s*(?P<mask>{NUMBER_PATTERN})") return applyChange(fileContents, checkRegex, getCheckMacro) def updateSet(fileContents: str) -> str: - # gSaveContext.save.weekEventReg[51] |= 0x10 - setRegex = re.compile(rf"gSaveContext.save.weekEventReg\[(?P<index>{NUMBER_PATTERN})\]\s*\|=\s*(?P<mask>{NUMBER_PATTERN})") + # gSaveContext.save.saveInfo.weekEventReg[51] |= 0x10 + setRegex = re.compile(rf"gSaveContext.save.saveInfo.weekEventReg\[(?P<index>{NUMBER_PATTERN})\]\s*\|=\s*(?P<mask>{NUMBER_PATTERN})") return applyChange(fileContents, setRegex, getSetMacro) def updateClear(fileContents: str) -> str: - # gSaveContext.save.weekEventReg[85] &= (u8)~0x80 - clearRegex = re.compile(rf"gSaveContext.save.weekEventReg\[(?P<index>{NUMBER_PATTERN})\]\s*\&=\s*(\(u8\))?~(?P<mask>{NUMBER_PATTERN})") + # gSaveContext.save.saveInfo.weekEventReg[85] &= (u8)~0x80 + clearRegex = re.compile(rf"gSaveContext.save.saveInfo.weekEventReg\[(?P<index>{NUMBER_PATTERN})\]\s*\&=\s*(\(u8\))?~(?P<mask>{NUMBER_PATTERN})") return applyChange(fileContents, clearRegex, getClearMacro) |