Merge branch 'working'

This commit is contained in:
jiangzhengwenjz 2020-05-19 08:50:46 -05:00
commit 715f9b960e
2 changed files with 2 additions and 3 deletions

View File

@ -26,7 +26,6 @@ void sub_080001CC(void) {
sub_0800ACD4(0, 0);
r6 = 1;
}
i = 0;
for (i = 0; i < 3; i++) {
if (sub_0800A91C(1, i) != 0) {
sub_0800AC00(1);

View File

@ -381,8 +381,8 @@ void sub_0814A794(struct TitleStruct* arg0) {
}
void sub_0814A7CC(struct TitleStruct* arg0) {
CpuFill16(RGB_WHITE, gBgPalette, 0x200);
CpuFill16(RGB_WHITE, gObjPalette, 0x200);
CpuFill16(RGB_WHITE, gBgPalette, BG_PLTT_SIZE);
CpuFill16(RGB_WHITE, gObjPalette, OBJ_PLTT_SIZE);
gUnk_03002440 |= 3;
GameStateDestroy(gCurGameState);
sub_08138B44();