ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-27 04:04:17 +01:00
Code Issues Packages Projects Releases Wiki Activity

make time events compile

Browse Source
This commit is contained in:
DizzyEggg 2018-01-29 16:25:09 +01:00
parent d728124a7b
commit 76fc1d1c12
18 changed files with 52 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
asm/cable_club.s
View File

@ -1808,7 +1808,7 @@ _080B32E0:
_080B32F8: _080B32F8:
movs r0, 0x1 movs r0, 0x1
movs r1, 0 movs r1, 0
bl fade_screen bl FadeScreen
ldr r1, =gLinkType ldr r1, =gLinkType
ldr r2, =0x00002211 ldr r2, =0x00002211
adds r0, r2, 0 adds r0, r2, 0
@ -1921,7 +1921,7 @@ _080B33E8:
_080B3408: _080B3408:
movs r0, 0x1 movs r0, 0x1
movs r1, 0 movs r1, 0
bl fade_screen bl FadeScreen
ldr r0, =gLinkType ldr r0, =gLinkType
ldr r2, =0x00002211 ldr r2, =0x00002211
adds r1, r2, 0 adds r1, r2, 0
@ -2399,7 +2399,7 @@ _080B382E:
bl ScriptContext2_Enable bl ScriptContext2_Enable
movs r0, 0x1 movs r0, 0x1
movs r1, 0 movs r1, 0
bl fade_screen bl FadeScreen
bl sub_8009FAC bl sub_8009FAC
b _080B3864 b _080B3864
_080B3840: _080B3840:
@ -2470,7 +2470,7 @@ _080B38C6:
bl ScriptContext2_Enable bl ScriptContext2_Enable
movs r0, 0x1 movs r0, 0x1
movs r1, 0 movs r1, 0
bl fade_screen bl FadeScreen
bl Rfu_set_zero bl Rfu_set_zero
b _080B38FC b _080B38FC
_080B38D8: _080B38D8:

2
asm/easy_chat.s
View File

@ -652,7 +652,7 @@ sub_811A7E4: @ 811A7E4
_0811A804: _0811A804:
movs r0, 0x1 movs r0, 0x1
movs r1, 0 movs r1, 0
bl fade_screen bl FadeScreen
b _0811A840 b _0811A840
_0811A80E: _0811A80E:
ldr r0, =gPaletteFade ldr r0, =gPaletteFade

28
asm/field_screen.s
View File

@ -1625,8 +1625,8 @@ _080ABCBC:
.pool .pool
thumb_func_end sub_80ABC7C thumb_func_end sub_80ABC7C
thumb_func_start fade_screen thumb_func_start FadeScreen
fade_screen: @ 80ABCD0 FadeScreen: @ 80ABCD0
push {r4,r5,lr} push {r4,r5,lr}
sub sp, 0x4 sub sp, 0x4
lsls r0, 24 lsls r0, 24
@ -1762,7 +1762,7 @@ _080ABDE4:
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end fade_screen thumb_func_end FadeScreen
thumb_func_start sub_80ABDFC thumb_func_start sub_80ABDFC
sub_80ABDFC: @ 80ABDFC sub_80ABDFC: @ 80ABDFC
@ -7537,8 +7537,8 @@ GetSav1Weather: @ 80AEDAC
.pool .pool
thumb_func_end GetSav1Weather thumb_func_end GetSav1Weather
thumb_func_start sub_80AEDBC thumb_func_start SetSav1WeatherFromCurrMapHeader
sub_80AEDBC: @ 80AEDBC SetSav1WeatherFromCurrMapHeader: @ 80AEDBC
push {r4,r5,lr} push {r4,r5,lr}
ldr r4, =gSaveBlock1Ptr ldr r4, =gSaveBlock1Ptr
ldr r0, [r4] ldr r0, [r4]
@ -7559,7 +7559,7 @@ sub_80AEDBC: @ 80AEDBC
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
thumb_func_end sub_80AEDBC thumb_func_end SetSav1WeatherFromCurrMapHeader
thumb_func_start sub_80AEDF0 thumb_func_start sub_80AEDF0
sub_80AEDF0: @ 80AEDF0 sub_80AEDF0: @ 80AEDF0
@ -7872,13 +7872,13 @@ _080AF06A:
bl palette_bg_faded_fill_black bl palette_bg_faded_fill_black
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl fade_screen bl FadeScreen
b _080AF084 b _080AF084
_080AF078: _080AF078:
bl palette_bg_faded_fill_white bl palette_bg_faded_fill_white
movs r0, 0x2 movs r0, 0x2
movs r1, 0 movs r1, 0
bl fade_screen bl FadeScreen
_080AF084: _080AF084:
pop {r4} pop {r4}
pop {r0} pop {r0}
@ -7891,7 +7891,7 @@ sub_80AF08C: @ 80AF08C
bl palette_bg_faded_fill_white bl palette_bg_faded_fill_white
movs r0, 0x2 movs r0, 0x2
movs r1, 0x8 movs r1, 0x8
bl fade_screen bl FadeScreen
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end sub_80AF08C thumb_func_end sub_80AF08C
@ -7902,7 +7902,7 @@ pal_fill_black: @ 80AF0A0
bl palette_bg_faded_fill_black bl palette_bg_faded_fill_black
movs r0, 0 movs r0, 0
movs r1, 0 movs r1, 0
bl fade_screen bl FadeScreen
pop {r0} pop {r0}
bx r0 bx r0
thumb_func_end pal_fill_black thumb_func_end pal_fill_black
@ -7928,12 +7928,12 @@ sub_80AF0B4: @ 80AF0B4
_080AF0DA: _080AF0DA:
movs r0, 0x1 movs r0, 0x1
movs r1, 0 movs r1, 0
bl fade_screen bl FadeScreen
b _080AF0EC b _080AF0EC
_080AF0E4: _080AF0E4:
movs r0, 0x3 movs r0, 0x3
movs r1, 0 movs r1, 0
bl fade_screen bl FadeScreen
_080AF0EC: _080AF0EC:
pop {r4} pop {r4}
pop {r0} pop {r0}
@ -8761,7 +8761,7 @@ sub_80AF79C: @ 80AF79C
bl music_something bl music_something
movs r0, 0x3 movs r0, 0x3
movs r1, 0x8 movs r1, 0x8
bl fade_screen bl FadeScreen
bl play_some_sound bl play_some_sound
ldr r0, =gFieldCallback ldr r0, =gFieldCallback
ldr r1, =sub_80AF3B0 ldr r1, =sub_80AF3B0
@ -8990,7 +8990,7 @@ _080AF99A:
bl sub_8009FAC bl sub_8009FAC
movs r0, 0x1 movs r0, 0x1
movs r1, 0 movs r1, 0
bl fade_screen bl FadeScreen
bl music_something bl music_something
movs r0, 0x9 movs r0, 0x9
bl PlaySE bl PlaySE

2
asm/item_use.s
View File

@ -1482,7 +1482,7 @@ _080FDBC8:
str r1, [r0] str r1, [r0]
movs r0, 0x1 movs r0, 0x1
movs r1, 0 movs r1, 0
bl fade_screen bl FadeScreen
ldr r0, =sub_80FDC00 ldr r0, =sub_80FDC00
str r0, [r5] str r0, [r5]
_080FDBDA: _080FDBDA:

2
asm/link.s
View File

@ -21684,7 +21684,7 @@ _080148CC:
bne _080149B2 bne _080149B2
movs r0, 0x1 movs r0, 0x1
movs r1, 0 movs r1, 0
bl fade_screen bl FadeScreen
movs r0, 0x2 movs r0, 0x2
strh r0, [r7] strh r0, [r7]
b _080149B2 b _080149B2

4
asm/overworld.s
View File

@ -1383,7 +1383,7 @@ _080850C8:
adds r1, r5, 0 adds r1, r5, 0
bl TryUpdateRandomTrainerRematches bl TryUpdateRandomTrainerRematches
bl DoTimeBasedEvents bl DoTimeBasedEvents
bl sub_80AEDBC bl SetSav1WeatherFromCurrMapHeader
bl sub_8085B2C bl sub_8085B2C
bl update_sav1_flash_used_on_map bl update_sav1_flash_used_on_map
bl Overworld_ClearSavedMusic bl Overworld_ClearSavedMusic
@ -1483,7 +1483,7 @@ _080851A2:
beq _080851EE beq _080851EE
bl DoTimeBasedEvents bl DoTimeBasedEvents
_080851EE: _080851EE:
bl sub_80AEDBC bl SetSav1WeatherFromCurrMapHeader
bl sub_8085B2C bl sub_8085B2C
cmp r5, 0 cmp r5, 0
beq _08085200 beq _08085200

8
asm/party_menu.s
View File

@ -17171,7 +17171,7 @@ sub_81B9404: @ 81B9404
bl ScriptContext2_Enable bl ScriptContext2_Enable
movs r0, 0x1 movs r0, 0x1
movs r1, 0 movs r1, 0
bl fade_screen bl FadeScreen
ldr r0, =sub_81B9424 ldr r0, =sub_81B9424
movs r1, 0xA movs r1, 0xA
bl CreateTask bl CreateTask
@ -17247,7 +17247,7 @@ sub_81B94B0: @ 81B94B0
bl ScriptContext2_Enable bl ScriptContext2_Enable
movs r0, 0x1 movs r0, 0x1
movs r1, 0 movs r1, 0
bl fade_screen bl FadeScreen
ldr r0, =sub_81B94D0 ldr r0, =sub_81B94D0
movs r1, 0xA movs r1, 0xA
bl CreateTask bl CreateTask
@ -17297,7 +17297,7 @@ sub_81B951C: @ 81B951C
bl ScriptContext2_Enable bl ScriptContext2_Enable
movs r0, 0x1 movs r0, 0x1
movs r1, 0 movs r1, 0
bl fade_screen bl FadeScreen
ldr r0, =sub_81B953C ldr r0, =sub_81B953C
movs r1, 0xA movs r1, 0xA
bl CreateTask bl CreateTask
@ -17418,7 +17418,7 @@ sub_81B9620: @ 81B9620
bl ScriptContext2_Enable bl ScriptContext2_Enable
movs r0, 0x1 movs r0, 0x1
movs r1, 0 movs r1, 0
bl fade_screen bl FadeScreen
ldr r0, =sub_81B9640 ldr r0, =sub_81B9640
movs r1, 0xA movs r1, 0xA
bl CreateTask bl CreateTask

6
asm/player_pc.s
View File

@ -552,7 +552,7 @@ sub_816B2C8: @ 816B2C8
str r0, [r1] str r0, [r1]
movs r0, 0x1 movs r0, 0x1
movs r1, 0 movs r1, 0
bl fade_screen bl FadeScreen
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool
@ -1221,7 +1221,7 @@ sub_816B878: @ 816B878
lsrs r4, 24 lsrs r4, 24
movs r0, 0x1 movs r0, 0x1
movs r1, 0 movs r1, 0
bl fade_screen bl FadeScreen
ldr r1, =gTasks ldr r1, =gTasks
lsls r0, r4, 2 lsls r0, r4, 2
adds r0, r4 adds r0, r4
@ -1494,7 +1494,7 @@ sub_816BABC: @ 816BABC
_0816BAD4: _0816BAD4:
movs r0, 0x1 movs r0, 0x1
movs r1, 0 movs r1, 0
bl fade_screen bl FadeScreen
ldr r0, =gTasks ldr r0, =gTasks
lsls r1, r4, 2 lsls r1, r4, 2
adds r1, r4 adds r1, r4

2
asm/pokemon_storage_system.s
View File

@ -406,7 +406,7 @@ _080C7428:
_080C745C: _080C745C:
movs r0, 0x1 movs r0, 0x1
movs r1, 0 movs r1, 0
bl fade_screen bl FadeScreen
movs r0, 0x4 movs r0, 0x4
strh r0, [r5, 0x8] strh r0, [r5, 0x8]
b _080C756A b _080C756A

2
asm/pokemon_summary_screen.s
View File

@ -2049,7 +2049,7 @@ sub_81C4F24: @ 81C4F24
bl ScriptContext2_Enable bl ScriptContext2_Enable
movs r0, 0x1 movs r0, 0x1
movs r1, 0 movs r1, 0
bl fade_screen bl FadeScreen
ldr r0, =sub_81C4F44 ldr r0, =sub_81C4F44
movs r1, 0xA movs r1, 0xA
bl CreateTask bl CreateTask

2
asm/pokenav.s
View File

@ -44,7 +44,7 @@ sub_81C72A4: @ 81C72A4
bl SetMainCallback2 bl SetMainCallback2
movs r0, 0x1 movs r0, 0x1
movs r1, 0 movs r1, 0
bl fade_screen bl FadeScreen
pop {r0} pop {r0}
bx r0 bx r0
.pool .pool

4
asm/shop.s
View File

@ -188,7 +188,7 @@ HandleShopMenuBuy: @ 80DFBD0
str r0, [r1] str r0, [r1]
movs r0, 0x1 movs r0, 0x1
movs r1, 0 movs r1, 0
bl fade_screen bl FadeScreen
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0
@ -216,7 +216,7 @@ HandleShopMenuSell: @ 80DFC0C
str r0, [r1] str r0, [r1]
movs r0, 0x1 movs r0, 0x1
movs r1, 0 movs r1, 0
bl fade_screen bl FadeScreen
pop {r4} pop {r4}
pop {r0} pop {r0}
bx r0 bx r0

2
asm/start_menu.s
View File

@ -449,7 +449,7 @@ _0809FB34:
beq _0809FBA0 beq _0809FBA0
movs r0, 0x1 movs r0, 0x1
movs r1, 0 movs r1, 0
bl fade_screen bl FadeScreen
b _0809FBA0 b _0809FBA0
.pool .pool
_0809FB98: _0809FB98:

2
include/field_weather.h
View File

@ -139,7 +139,7 @@ enum
FADE_TO_WHITE, FADE_TO_WHITE,
}; };
void FadeScreen(u8, u8); void FadeScreen(u8, s8);
// ... // ...
void UpdateSpritePaletteWithWeather(u8 tag); void UpdateSpritePaletteWithWeather(u8 tag);
void ApplyWeatherGammaShiftToPal(u8); void ApplyWeatherGammaShiftToPal(u8);

10
src/decoration.c
View File

@ -529,7 +529,7 @@ void SecretBasePC_PutAway(u8 taskId)
{ {
sub_8126A58(0); sub_8126A58(0);
sub_8197434(0, 0); sub_8197434(0, 0);
fade_screen(1, 0); FadeScreen(1, 0);
gTasks[taskId].data[2] = 0; gTasks[taskId].data[2] = 0;
gTasks[taskId].func = sub_8129ABC; gTasks[taskId].func = sub_8129ABC;
} }
@ -1247,7 +1247,7 @@ void sub_8127F68(u8 taskId)
{ {
if (sub_8127F38() == TRUE) if (sub_8127F38() == TRUE)
{ {
fade_screen(1, 0); FadeScreen(1, 0);
gTasks[taskId].data[2] = 0; gTasks[taskId].data[2] = 0;
gTasks[taskId].func = sub_8128060; gTasks[taskId].func = sub_8128060;
} }
@ -1661,7 +1661,7 @@ void sub_8128BA0(u8 taskId)
void sub_8128BBC(u8 taskId) void sub_8128BBC(u8 taskId)
{ {
fade_screen(1, 0); FadeScreen(1, 0);
gTasks[taskId].data[2] = 0; gTasks[taskId].data[2] = 0;
gTasks[taskId].func = c1_overworld_prev_quest; gTasks[taskId].func = c1_overworld_prev_quest;
} }
@ -2635,7 +2635,7 @@ void sub_812A1A0(u8 taskId)
void sub_812A1C0(u8 taskId) void sub_812A1C0(u8 taskId)
{ {
fade_screen(1, 0); FadeScreen(1, 0);
gTasks[taskId].data[2] = 0; gTasks[taskId].data[2] = 0;
gTasks[taskId].func = sub_81298EC; gTasks[taskId].func = sub_81298EC;
} }
@ -2654,7 +2654,7 @@ void sub_812A210(u8 taskId)
void sub_812A22C(u8 taskId) void sub_812A22C(u8 taskId)
{ {
fade_screen(1, 0); FadeScreen(1, 0);
gTasks[taskId].data[2] = 0; gTasks[taskId].data[2] = 0;
gTasks[taskId].func = sub_812A25C; gTasks[taskId].func = sub_812A25C;
} }

4
src/egg_hatch.c
View File

@ -61,7 +61,7 @@ extern u8 sav1_map_get_name(void);
extern s8 ProcessMenuInputNoWrap_(void); extern s8 ProcessMenuInputNoWrap_(void);
extern void TVShowConvertInternationalString(u8* str1, u8* str2, u8); extern void TVShowConvertInternationalString(u8* str1, u8* str2, u8);
extern void sub_806A068(u16, u8); extern void sub_806A068(u16, u8);
extern void fade_screen(u8, u8); extern void FadeScreen(u8, u8);
extern void overworld_free_bg_tilemaps(void); extern void overworld_free_bg_tilemaps(void);
extern void sub_80AF168(void); extern void sub_80AF168(void);
extern void AllocateMonSpritesGfx(void); extern void AllocateMonSpritesGfx(void);
@ -465,7 +465,7 @@ void EggHatch(void)
{ {
ScriptContext2_Enable(); ScriptContext2_Enable();
CreateTask(Task_EggHatch, 10); CreateTask(Task_EggHatch, 10);
fade_screen(1, 0); FadeScreen(1, 0);
} }
static void Task_EggHatch(u8 taskID) static void Task_EggHatch(u8 taskID)

10
src/scrcmd.c
View File

@ -638,7 +638,7 @@ static bool8 IsPaletteNotActive(void)
bool8 ScrCmd_fadescreen(struct ScriptContext *ctx) bool8 ScrCmd_fadescreen(struct ScriptContext *ctx)
{ {
fade_screen(ScriptReadByte(ctx), 0); FadeScreen(ScriptReadByte(ctx), 0);
SetupNativeScript(ctx, IsPaletteNotActive); SetupNativeScript(ctx, IsPaletteNotActive);
return TRUE; return TRUE;
} }
@ -648,7 +648,7 @@ bool8 ScrCmd_fadescreenspeed(struct ScriptContext *ctx)
u8 mode = ScriptReadByte(ctx); u8 mode = ScriptReadByte(ctx);
u8 speed = ScriptReadByte(ctx); u8 speed = ScriptReadByte(ctx);
fade_screen(mode, speed); FadeScreen(mode, speed);
SetupNativeScript(ctx, IsPaletteNotActive); SetupNativeScript(ctx, IsPaletteNotActive);
return TRUE; return TRUE;
} }
@ -662,12 +662,12 @@ bool8 ScrCmd_fadescreenswapbuffers(struct ScriptContext *ctx)
case 1: case 1:
default: default:
CpuCopy32(gPlttBufferUnfaded, gPaletteDecompressionBuffer, PLTT_DECOMP_BUFFER_SIZE); CpuCopy32(gPlttBufferUnfaded, gPaletteDecompressionBuffer, PLTT_DECOMP_BUFFER_SIZE);
fade_screen(mode, 0); FadeScreen(mode, 0);
break; break;
case 0: case 0:
case 2: case 2:
CpuCopy32(gPaletteDecompressionBuffer, gPlttBufferUnfaded, PLTT_DECOMP_BUFFER_SIZE); CpuCopy32(gPaletteDecompressionBuffer, gPlttBufferUnfaded, PLTT_DECOMP_BUFFER_SIZE);
fade_screen(mode, 0); FadeScreen(mode, 0);
break; break;
} }
@ -726,7 +726,7 @@ bool8 ScrCmd_setweather(struct ScriptContext *ctx)
bool8 ScrCmd_resetweather(struct ScriptContext *ctx) bool8 ScrCmd_resetweather(struct ScriptContext *ctx)
{ {
sub_80AEDBC(); SetSav1WeatherFromCurrMapHeader();
return FALSE; return FALSE;
} }

6
src/secret_base.c
View File

@ -394,7 +394,7 @@ void sub_80E8FD0(u8 taskId)
void sub_80E9068(void) void sub_80E9068(void)
{ {
CreateTask(sub_80E8FD0, 0); CreateTask(sub_80E8FD0, 0);
fade_screen(1, 0); FadeScreen(1, 0);
saved_warp2_set(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1); saved_warp2_set(0, gSaveBlock1Ptr->location.mapGroup, gSaveBlock1Ptr->location.mapNum, -1);
} }
@ -451,7 +451,7 @@ void sub_80E916C(u8 taskId)
void sub_80E91F8(void) void sub_80E91F8(void)
{ {
CreateTask(sub_80E916C, 0); CreateTask(sub_80E916C, 0);
fade_screen(1, 0); FadeScreen(1, 0);
} }
bool8 CurrentMapIsSecretBase(void) bool8 CurrentMapIsSecretBase(void)
@ -651,7 +651,7 @@ void sub_80E96A4(u8 taskId)
void sub_80E9728(void) void sub_80E9728(void)
{ {
CreateTask(sub_80E96A4, 0); CreateTask(sub_80E96A4, 0);
fade_screen(1, 0); FadeScreen(1, 0);
} }
void sub_80E9744(void) void sub_80E9744(void)