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

Merge pull request #1633 from abaresk/slot-cleanup

Browse Source 
Clean up and document Slot Machines more
This commit is contained in:
GriffinR 2022-02-20 17:59:14 -05:00 committed by GitHub
commit eca5233abe
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 1618 additions and 1073 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/scrcmd.c
View File

@ -1916,9 +1916,9 @@ bool8 ScrCmd_pokemartdecoration2(struct ScriptContext *ctx)
bool8 ScrCmd_playslotmachine(struct ScriptContext *ctx) bool8 ScrCmd_playslotmachine(struct ScriptContext *ctx)
{ {
u8 slotMachineIndex = VarGet(ScriptReadHalfword(ctx)); u8 machineId = VarGet(ScriptReadHalfword(ctx));
PlaySlotMachine(slotMachineIndex, CB2_ReturnToFieldContinueScriptPlayMapMusic); PlaySlotMachine(machineId, CB2_ReturnToFieldContinueScriptPlayMapMusic);
ScriptContext1_Stop(); ScriptContext1_Stop();
return TRUE; return TRUE;
} }

2687
src/slot_machine.c
View File

File diff suppressed because it is too large Load Diff