sms/gctGenerator
1
0
Fork 0
Code Issues Pull requests Activity

[QFT v1.2] Fix QFT background when 112*fontSize is not an integer

Browse source
This commit is contained in:
sup39 2022-10-16 13:39:02 +09:00
parent fd0b85cfd7
commit 5f81c7b9b1
3 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Codes.xml
View file

@ -1237,8 +1237,8 @@
<title lang="en-US">Quarterframe Timer (Experimental)</title> <title lang="en-US">Quarterframe Timer (Experimental)</title>
<title lang="ja-JP">QFタイマー</title> <title lang="ja-JP">QFタイマー</title>
<author>Noki Doki, sup39(サポミク)</author> <author>Noki Doki, sup39(サポミク)</author>
<version>1.1</version> <version>1.2</version>
<date>Apr 22, 2022</date> <date>Oct 16, 2022</date>
<dependencies version="GMSJ01">drawText</dependencies> <dependencies version="GMSJ01">drawText</dependencies>
<dependencies version="GMSJ0A">drawText</dependencies> <dependencies version="GMSJ0A">drawText</dependencies>
<description lang="en-US"> <description lang="en-US">

3
changelog.md
View file

@ -1,4 +1,7 @@
# Changelog # Changelog
## Oct 16, 2022
\[QFT v1.2] Fix QFT background when 112\*fontSize is not an integer
## Jun 8, 2022 ## Jun 8, 2022
### Fixed 'Shine Get Timer' stopping on any cutscene started after touching a Shine ### Fixed 'Shine Get Timer' stopping on any cutscene started after touching a Shine
Shoutouts to plankton for touching the Pinna 1 Shine before its spawn cutscene started, in which case the timer would stop around 8 seconds early. Shoutouts to plankton for touching the Pinna 1 Shine before its spawn cutscene started, in which case the timer would stop around 8 seconds early.

17
site/.vuepress/components/codes/qft/codegen.js
View file

@ -37,10 +37,8 @@ export function getConfig() {
}; };
} }
const int16 = (x) => /** @param {number} x */
(x < 0 ? x + 0x10000 : x).toString(16).padStart(4, '0').slice(-4).toUpperCase(); const inst2gecko = (x) => (x >>> 0).toString(16).toUpperCase().padStart(8, '0');
const int32 = (x) =>
(x < 0 ? x + 0x100000000 : x).toString(16).padStart(8, '0').slice(-8).toUpperCase();
import * as GMSJ01 from './code/GMSJ01.js'; import * as GMSJ01 from './code/GMSJ01.js';
import * as GMSE01 from './code/GMSE01.js'; import * as GMSE01 from './code/GMSE01.js';
@ -68,6 +66,7 @@ export const codes = { GMSJ01, GMSE01, GMSP01, GMSJ0A };
bl 817fxxxx bl 817fxxxx
****/ ****/
const freezeCodeAddr = 0x817f0348; const freezeCodeAddr = 0x817f0348;
/** @param {keyof typeof codes} version */
export default function codegen(version) { export default function codegen(version) {
const config = getConfig(); const config = getConfig();
const { freezeCodeInfo, baseCode, r13off } = codes[version] ?? {}; const { freezeCodeInfo, baseCode, r13off } = codes[version] ?? {};
@ -99,7 +98,7 @@ export default function codegen(version) {
0x60000000, 0x60000000,
0x00000000, 0x00000000,
] ]
.map(int32) .map(inst2gecko)
.join(''); .join('');
} else { } else {
// handle regular freezing code later // handle regular freezing code later
@ -124,7 +123,7 @@ export default function codegen(version) {
0x916c00bc, // stw r11, 0xBC(r12) 0x916c00bc, // stw r11, 0xBC(r12)
0x00000000, 0x00000000,
]) ])
.map(int32) .map(inst2gecko)
.join(''); .join('');
} else { } else {
const code04 = []; const code04 = [];
@ -160,7 +159,7 @@ export default function codegen(version) {
code07.push(0); code07.push(0);
} }
// apply code // apply code
code += [...code04, ...code07].map(int32).join(''); code += [...code04, ...code07].map(inst2gecko).join('');
} }
// ui (GMSJ01/GMSJ0A only) // ui (GMSJ01/GMSJ0A only)
@ -175,7 +174,7 @@ export default function codegen(version) {
x + width * scale, // x2 x + width * scale, // x2
y, // y2 y, // y2
] ]
.map(int32) .map(inst2gecko)
.join(''); .join('');
code += '25753a253032752e2530337500000000'; // fmt code += '25753a253032752e2530337500000000'; // fmt
/* fontSize, fgColor, bgColor */ /* fontSize, fgColor, bgColor */
@ -184,7 +183,7 @@ export default function codegen(version) {
const fgColor = (config.fgRGB & 0xffffff) * 256 + (config.fgA & 0xff); const fgColor = (config.fgRGB & 0xffffff) * 256 + (config.fgA & 0xff);
const fgColor2 = const fgColor2 =
((config.fgRGB2 ?? config.fgRGB) & 0xffffff) * 256 + ((config.fgA2 ?? config.fgA) & 0xff); ((config.fgRGB2 ?? config.fgRGB) & 0xffffff) * 256 + ((config.fgA2 ?? config.fgA) & 0xff);
code += [fontSize, fgColor, fgColor2, bgColor].map(int32).join(''); code += [fontSize, fgColor, fgColor2, bgColor].map(inst2gecko).join('');
} }
return code.replace(/\s/g, ''); return code.replace(/\s/g, '');