Merge pull request #62 from Clownacy/master
Made TextScr.cpp as ASM-accurate as possible for now, and added a bugfix
This commit is contained in:
commit
f302c55978
4 changed files with 429 additions and 388 deletions
|
@ -1,2 +1,5 @@
|
||||||
Main.cpp : void SystemTask()
|
Main.cpp : void SystemTask()
|
||||||
Pixel intended for the second alternate up key to be the plus key, Japanese keyboards have the plus key where the semi-colon key is, causing errors on other keyboard layouts)
|
Pixel intended for the second alternate up key to be the plus key, Japanese keyboards have the plus key where the semi-colon key is, causing errors on other keyboard layouts)
|
||||||
|
|
||||||
|
SelStage.cpp : int StageSelectLoop(int *p_event)
|
||||||
|
The screencap that serves as the menu's background was being drawn with transparency enabled. This can cause moving sprites (like the text) to leave a trail.
|
||||||
|
|
|
@ -165,7 +165,12 @@ int StageSelectLoop(int *p_event)
|
||||||
if (tscRet == 2)
|
if (tscRet == 2)
|
||||||
return 2;
|
return 2;
|
||||||
|
|
||||||
|
#ifdef FIX_BUGS
|
||||||
|
PutBitmap4(&rcView, 0, 0, &rcView, 10);
|
||||||
|
#else
|
||||||
|
// The original accidentally drew the screencap with transparency enabled
|
||||||
PutBitmap3(&rcView, 0, 0, &rcView, 10);
|
PutBitmap3(&rcView, 0, 0, &rcView, 10);
|
||||||
|
#endif
|
||||||
PutStageSelectObject();
|
PutStageSelectObject();
|
||||||
PutTextScript();
|
PutTextScript();
|
||||||
|
|
||||||
|
|
805
src/TextScr.cpp
805
src/TextScr.cpp
File diff suppressed because it is too large
Load diff
|
@ -54,13 +54,13 @@ struct TEXT_SCRIPT
|
||||||
uint8_t wait_beam;
|
uint8_t wait_beam;
|
||||||
};
|
};
|
||||||
|
|
||||||
bool InitTextScript2();
|
BOOL InitTextScript2();
|
||||||
void EndTextScript();
|
void EndTextScript();
|
||||||
void EncryptionBinaryData2(uint8_t *pData, int size);
|
void EncryptionBinaryData2(uint8_t *pData, int size);
|
||||||
bool LoadTextScript2(const char *name);
|
bool LoadTextScript2(const char *name);
|
||||||
bool LoadTextScript_Stage(char *name);
|
bool LoadTextScript_Stage(char *name);
|
||||||
void GetTextScriptPath(char *path);
|
void GetTextScriptPath(char *path);
|
||||||
bool StartTextScript(int no);
|
BOOL StartTextScript(int no);
|
||||||
void StopTextScript();
|
void StopTextScript();
|
||||||
void PutTextScript();
|
void PutTextScript();
|
||||||
int TextScriptProc();
|
int TextScriptProc();
|
Loading…
Add table
Reference in a new issue