mirror/mm
1
0
Fork 0
mirror of https://github.com/zeldaret/mm.git synced 2026-06-22 00:06:28 -04:00
Code Issues Packages Projects Releases Wiki Activity

Bombers2 OK (#721)

Browse Source 
* OK

* OK

* cleanups

* restore makefile

* format

* format

* format

* Update src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.h

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.h

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/overlays/actors/ovl_En_Bombers2/z_en_bombers2.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/overlays/actors/ovl_En_Bomjima/z_en_bomjima.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update src/overlays/actors/ovl_En_Bomjimb/z_en_bomjimb.c

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>

* Update object_cs.xml

* fixes

* format

Co-authored-by: Derek Hensley <hensley.derek58@gmail.com>
Co-authored-by: angie <angheloalf95@gmail.com>
This commit is contained in:
louist103
2022-03-27 10:47:34 -04:00
committed by GitHub
parent f1d1173558
commit 928acac500
12 changed files with 444 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/code/code_8012EC80.c
+3 -3
View File
@@ -720,8 +720,8 @@ s16 Inventory_GetSkullTokenCount(s16 sceneIndex) {
void Inventory_SaveLotteryCodeGuess(GlobalContext* globalCtx) {
u16 lotteryCodeGuess;
lotteryCodeGuess = ((globalCtx->msgCtx.unk12054 & 0xF) << 8); // First Digit
lotteryCodeGuess |= ((globalCtx->msgCtx.unk12056 & 0xF) << 4); // Second Digit
lotteryCodeGuess |= (globalCtx->msgCtx.unk12058 & 0xF); // Third Digit
lotteryCodeGuess = ((globalCtx->msgCtx.unk12054[0] & 0xF) << 8); // First Digit
lotteryCodeGuess |= ((globalCtx->msgCtx.unk12054[1] & 0xF) << 4); // Second Digit
lotteryCodeGuess |= (globalCtx->msgCtx.unk12054[2] & 0xF); // Third Digit
gSaveContext.lotteryCodeGuess = (gSaveContext.lotteryCodeGuess & 0xFFFF0000) | (lotteryCodeGuess & 0xFFFF);
}