diff options
| author | louist103 <35883445+louist103@users.noreply.github.com> | 2022-03-27 10:47:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-27 11:47:34 -0300 |
| commit | 928acac500e8b7df19998003b466b4dc8371dc01 (patch) | |
| tree | e21b9522561b59bb82b6bae9b58dfbb53b044519 /src/code/code_8012EC80.c | |
| parent | f1d1173558e6fc01dfe7e884e29643d640db5a77 (diff) | |
Bombers2 OK (#721)
* 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>
Diffstat (limited to 'src/code/code_8012EC80.c')
| -rw-r--r-- | src/code/code_8012EC80.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/code/code_8012EC80.c b/src/code/code_8012EC80.c index c65697483..f60d98568 100644 --- a/src/code/code_8012EC80.c +++ b/src/code/code_8012EC80.c @@ -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); } |