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

Continue porting roulette

Browse Source
This commit is contained in:
Diegoisawesome 2018-12-31 18:07:29 -06:00
parent 439fa13e94
commit af1e44befe
5 changed files with 1159 additions and 4241 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4216
asm/roulette.s
View File

File diff suppressed because it is too large Load Diff

2
data/event_scripts.s
View File

@ -4695,7 +4695,7 @@ MauvilleCity_GameCorner_EventScript_2A5ADF:: @ 82A5ADF
end end
MauvilleCity_GameCorner_EventScript_2A5B0D:: @ 82A5B0D MauvilleCity_GameCorner_EventScript_2A5B0D:: @ 82A5B0D
special sub_8142BC8 special PlayRoulette
waitstate waitstate
end end

2
data/specials.inc
View File

@ -173,7 +173,7 @@ gSpecials:: @ 81DBA64
def_special sub_81B94B0 def_special sub_81B94B0
def_special GetFirstFreePokeblockSlot def_special GetFirstFreePokeblockSlot
def_special DoBerryBlending def_special DoBerryBlending
def_special sub_8142BC8 def_special PlayRoulette
def_special ShouldMoveLilycoveFanClubMember def_special ShouldMoveLilycoveFanClubMember
def_special GetNumMovedLilycoveFanClubMembers def_special GetNumMovedLilycoveFanClubMembers
def_special BufferStreakTrainerText def_special BufferStreakTrainerText

1
include/roulette_util.h
View File

@ -47,5 +47,6 @@ void task_tutorial_controls_fadein(struct UnkStruct0 *r0);
void sub_8151678(struct UnkStruct0 *r0); void sub_8151678(struct UnkStruct0 *r0);
u8 sub_815168C(struct UnkStruct0 *r0, u8 r1, const struct UnkStruct1 *r2); u8 sub_815168C(struct UnkStruct0 *r0, u8 r1, const struct UnkStruct1 *r2);
void sub_8151A9C(struct UnkStruct0 *r0, u16 r1); void sub_8151A9C(struct UnkStruct0 *r0, u16 r1);
void sub_8151A48(struct UnkStruct0 *r0, u16 r1);
#endif // GUARD_ROULETTE_UTIL_H #endif // GUARD_ROULETTE_UTIL_H

1179
src/roulette.c
View File

File diff suppressed because it is too large Load Diff