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

Start porting/decompiling roulette

Browse Source
This commit is contained in:
Diegoisawesome 2018-12-31 16:09:45 -06:00
parent 530a20354c
commit 439fa13e94
10 changed files with 1073 additions and 2221 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2213
asm/roulette.s
View File

File diff suppressed because it is too large Load Diff

2
include/menu_helpers.h
View File

@ -20,7 +20,7 @@ void ResetAllBgsCoordinates(void);
void SetVBlankHBlankCallbacksToNull(void); void SetVBlankHBlankCallbacksToNull(void);
void DisplayMessageAndContinueTask(u8 taskId, u8 windowId, u16 arg2, u8 arg3, u8 fontId, u8 textSpeed, const u8 *string, void *taskFunc); void DisplayMessageAndContinueTask(u8 taskId, u8 windowId, u16 arg2, u8 arg3, u8 fontId, u8 textSpeed, const u8 *string, void *taskFunc);
bool16 RunTextPrintersRetIsActive(u8 textPrinterId); bool16 RunTextPrintersRetIsActive(u8 textPrinterId);
void sub_8121F68(u8 taskId, const struct YesNoFuncTable *data); void DoYesNoFuncWithChoice(u8 taskId, const struct YesNoFuncTable *data);
void CreateYesNoMenuWithCallbacks(u8 taskId, const struct WindowTemplate *template, u8 arg2, u8 arg3, u8 arg4, u16 tileStart, u8 palette, const struct YesNoFuncTable *yesNo); void CreateYesNoMenuWithCallbacks(u8 taskId, const struct WindowTemplate *template, u8 arg2, u8 arg3, u8 arg4, u16 tileStart, u8 palette, const struct YesNoFuncTable *yesNo);
bool8 AdjustQuantityAccordingToDPadInput(s16 *arg0, u16 arg1); bool8 AdjustQuantityAccordingToDPadInput(s16 *arg0, u16 arg1);
u8 GetLRKeysState(void); u8 GetLRKeysState(void);

6
include/roulette_util.h
View File

@ -1,6 +1,8 @@
#ifndef GUARD_ROULETTE_UTIL_H #ifndef GUARD_ROULETTE_UTIL_H
#define GUARD_ROULETTE_UTIL_H #define GUARD_ROULETTE_UTIL_H
#include "roulette.h"
struct PulseBlendSettings struct PulseBlendSettings
{ {
u16 blendColor; u16 blendColor;
@ -41,5 +43,9 @@ void UnmarkUsedPulseBlendPalettes(struct PulseBlend *, u16, u8);
void UpdatePulseBlend(struct PulseBlend *); void UpdatePulseBlend(struct PulseBlend *);
void sub_8152008(u16 *dest, u16 src, u8 left, u8 top, u8 width, u8 height); void sub_8152008(u16 *dest, u16 src, u8 left, u8 top, u8 width, u8 height);
void sub_8152058(u16 *dest, u16 *src, u8 left, u8 top, u8 width, u8 height); void sub_8152058(u16 *dest, u16 *src, u8 left, u8 top, u8 width, u8 height);
void task_tutorial_controls_fadein(struct UnkStruct0 *r0);
void sub_8151678(struct UnkStruct0 *r0);
u8 sub_815168C(struct UnkStruct0 *r0, u8 r1, const struct UnkStruct1 *r2);
void sub_8151A9C(struct UnkStruct0 *r0, u16 r1);
#endif // GUARD_ROULETTE_UTIL_H #endif // GUARD_ROULETTE_UTIL_H

3
include/strings.h
View File

@ -1990,4 +1990,7 @@ extern const u8 gText_XSentOverY[];
extern const u8 gText_TakeGoodCareOfX[]; extern const u8 gText_TakeGoodCareOfX[];
extern const u8 gText_CommunicationStandby5[]; extern const u8 gText_CommunicationStandby5[];
// roulette
extern const u8 gUnknown_082A5B89[];
#endif //GUARD_STRINGS_H #endif //GUARD_STRINGS_H

1
ld_script.txt
View File

@ -206,6 +206,7 @@ SECTIONS {
src/battle_records.o(.text); src/battle_records.o(.text);
src/pokedex_area_screen.o(.text); src/pokedex_area_screen.o(.text);
src/evolution_scene.o(.text); src/evolution_scene.o(.text);
src/roulette.o(.text);
asm/roulette.o(.text); asm/roulette.o(.text);
src/pokedex_cry_screen.o(.text); src/pokedex_cry_screen.o(.text);
src/coins.o(.text); src/coins.o(.text);

10
src/decoration.c
View File

@ -1629,7 +1629,7 @@ void sub_8128950(u8 taskId)
void sub_81289D0(u8 taskId) void sub_81289D0(u8 taskId)
{ {
DisplayYesNoMenu(); DisplayYesNoMenu();
sub_8121F68(taskId, &gUnknown_085A72C4); DoYesNoFuncWithChoice(taskId, &gUnknown_085A72C4);
} }
void sub_81289F0(u8 taskId) void sub_81289F0(u8 taskId)
@ -1694,7 +1694,7 @@ void sub_8128AAC(u8 taskId)
void sub_8128B80(u8 taskId) void sub_8128B80(u8 taskId)
{ {
DisplayYesNoMenu(); DisplayYesNoMenu();
sub_8121F68(taskId, &gUnknown_085A72CC); DoYesNoFuncWithChoice(taskId, &gUnknown_085A72CC);
} }
void sub_8128BA0(u8 taskId) void sub_8128BA0(u8 taskId)
@ -2589,7 +2589,7 @@ void sub_812A0E8(u8 taskId)
void sub_812A1A0(u8 taskId) void sub_812A1A0(u8 taskId)
{ {
DisplayYesNoMenu(); DisplayYesNoMenu();
sub_8121F68(taskId, &gUnknown_085A7348); DoYesNoFuncWithChoice(taskId, &gUnknown_085A7348);
} }
void sub_812A1C0(u8 taskId) void sub_812A1C0(u8 taskId)
@ -2602,7 +2602,7 @@ void sub_812A1C0(u8 taskId)
void sub_812A1F0(u8 taskId) void sub_812A1F0(u8 taskId)
{ {
DisplayYesNoMenu(); DisplayYesNoMenu();
sub_8121F68(taskId, &gUnknown_085A7350); DoYesNoFuncWithChoice(taskId, &gUnknown_085A7350);
} }
void sub_812A210(u8 taskId) void sub_812A210(u8 taskId)
@ -2726,7 +2726,7 @@ void sub_812A3D4(u8 taskId)
void sub_812A458(u8 taskId) void sub_812A458(u8 taskId)
{ {
DisplayYesNoMenu(); DisplayYesNoMenu();
sub_8121F68(taskId, &gUnknown_085A741C); DoYesNoFuncWithChoice(taskId, &gUnknown_085A741C);
} }
void sub_812A478(u8 taskId) void sub_812A478(u8 taskId)

2
src/menu_helpers.c
View File

@ -152,7 +152,7 @@ static void Task_ContinueTaskAfterMessagePrints(u8 taskId)
gUnknown_0300117C(taskId); gUnknown_0300117C(taskId);
} }
void sub_8121F68(u8 taskId, const struct YesNoFuncTable *data) void DoYesNoFuncWithChoice(u8 taskId, const struct YesNoFuncTable *data)
{ {
gUnknown_0203A138 = *data; gUnknown_0203A138 = *data;
gTasks[taskId].func = Task_CallYesOrNoCallback; gTasks[taskId].func = Task_CallYesOrNoCallback;

1053
src/roulette.c Normal file
View File

File diff suppressed because it is too large Load Diff

2
src/roulette_util.c
View File

@ -11,7 +11,7 @@ void sub_8151678(struct UnkStruct0 *r0)
memset(&r0->var04, 0, sizeof(r0->var04)); memset(&r0->var04, 0, sizeof(r0->var04));
} }
u8 sub_815168C(struct UnkStruct0 *r0, u8 r1, struct UnkStruct1 *r2) u8 sub_815168C(struct UnkStruct0 *r0, u8 r1, const struct UnkStruct1 *r2)
{ {
if (!(r1 < 16) || (r0->var04[r1].var00_7)) if (!(r1 < 16) || (r0->var04[r1].var00_7))
return 0xFF; return 0xFF;

2
src/secret_base.c
View File

@ -1032,7 +1032,7 @@ void sub_80E9FFC(u8 taskId)
void sub_80EA06C(u8 taskId) void sub_80EA06C(u8 taskId)
{ {
DisplayYesNoMenu(); DisplayYesNoMenu();
sub_8121F68(taskId, &gUnknown_0858D058); DoYesNoFuncWithChoice(taskId, &gUnknown_0858D058);
} }
void sub_80EA08C(u8 taskId) void sub_80EA08C(u8 taskId)