Namefixer Fixes (#1252)

* Fixes

* gSaveContext.save.playerData.doubleMagic
This commit is contained in:
Derek Hensley 2023-05-27 18:49:19 -07:00 committed by GitHub
parent 74d881e921
commit 7a5cbf2e20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 6 deletions

View File

@ -605,7 +605,7 @@ void KaleidoScope_DrawInventoryEditor(PlayState* play) {
KaleidoScope_DrawDigit(play, gSaveContext.save.saveInfo.playerData.doubleDefense, 44, 202);
// Magic
//! @bug should be gSaveContext.save.saveInfo.playerData.doubleMagic
//! @bug should be gSaveContext.save.saveInfo.playerData.isDoubleMagicAcquired
KaleidoScope_DrawDigit(play, gSaveContext.save.saveInfo.playerData.doubleDefense, 75, 202);
// Lottery

View File

@ -18,7 +18,7 @@ simpleReplace = {
wordReplace = {
# Functions
"Actor_GetSwitchFlag": "Flags_GetSwitch",
"Math_FAtan2F": "Math_Atan2S_XY",
# "Math_FAtan2F": "Math_Atan2S_XY", // All old Math_FAtan2F should be renamed, so func_80086B30 can be renamed to Math_FAtan2F
"Math_Acot2F": "Math_Atan2F_XY",
"atan_flip": "Math_Atan2F_XY",
"atans": "Math_Atan2S",
@ -830,9 +830,8 @@ wordReplace = {
"gSaveContext.permanentSceneFlags": "gSaveContext.save.saveInfo.permanentSceneFlags",
"gSaveContext.bomberCode": "gSaveContext.save.saveInfo.bomberCode",
"gSaveContext.skullTokenCount": "gSaveContext.save.saveInfo.skullTokenCount",
"gSaveContext.cutscene": "gSaveContext.save.saveInfo.cutsceneIndex",
"gSaveContext.save.cutscene": "gSaveContext.save.saveInfo.cutsceneIndex",
"gSaveContext.save.saveInfo.cutscene": "gSaveContext.save.saveInfo.cutsceneIndex",
"gSaveContext.cutscene": "gSaveContext.save.cutsceneIndex",
"gSaveContext.save.cutscene": "gSaveContext.save.cutsceneIndex",
"gSaveContext.health": "gSaveContext.save.saveInfo.playerData.health",
"gSaveContext.equips": "gSaveContext.save.saveInfo.equips",
"gSaveContext.unk_1016": "gSaveContext.jinxTimer",
@ -840,7 +839,7 @@ wordReplace = {
"gSaveContext.equips.buttonItems": "gSaveContext.save.equips.buttonItems",
"gSaveContext.unk_48C8": "gSaveContext.dungeonIndex",
"gSaveContext.save.saveInfo.playerData.magicAcquired": "gSaveContext.save.saveInfo.playerData.isMagicAcquired",
"gSaveContext.save.playerDatadoubleMagic": "gSaveContext.save.saveInfo.playerData.isDoubleMagicAcquired",
"gSaveContext.save.playerData.doubleMagic": "gSaveContext.save.saveInfo.playerData.isDoubleMagicAcquired",
"gSaveContext.unk_3F28": "gSaveContext.magicState",
"gSaveContext.unk_3F30": "gSaveContext.magicFillTarget",
"gSaveContext.unk_3F2C": "gSaveContext.magicFlag",