Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mystery_gift.c #271

Merged
merged 10 commits into from
Dec 19, 2023
Merged

mystery_gift.c #271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ec1f0aa
Through sub_0202DC2C
PikalaxALT Dec 2, 2023
f8c138d
Finish mystery_gift.c
PikalaxALT Dec 7, 2023
2ffd8f2
Rename mystery_gift.c functions
PikalaxALT Dec 7, 2023
ac98817
Update fn names; document public routines
PikalaxALT Dec 7, 2023
6bd2b0a
capitalize MG_TAG_* defines
PikalaxALT Dec 7, 2023
fdbb0d4
Merge branch 'master' into mystery_gift
PikalaxALT Dec 10, 2023
4c6aa45
Update some names; simplify some statements
PikalaxALT Dec 11, 2023
7334c8e
Address other review comments
PikalaxALT Dec 17, 2023
1562b47
Merge remote-tracking branch 'origin/master' into mystery_gift
PikalaxALT Dec 17, 2023
1338864
Merge branch 'master' into mystery_gift
adrienntindall Dec 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions asm/include/overlay_74_thumb.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,21 +213,21 @@
.public GetIGTMinutes
.public Save_MysteryGift_Init
.public SaveMysteryGift_CardGetByIdx
.public sub_0202DC2C
.public sub_0202DCAC
.public sub_0202DD48
.public sub_0202DDB0
.public sub_0202DDEC
.public SaveMysteryGift_TryInsertGift
.public SaveMysteryGift_TryInsertCard
.public SaveMysteryGift_TrySetSpecialCard
.public SaveMysteryGift_ReceiveGiftAndClearCardByIndex
.public SaveMysteryGift_DeleteWonderCardByIndex
.public SaveMysteryGift_FindAvailable
.public SaveMysteryGift_CardFindAvailable
.public sub_0202DE90
.public sub_0202DEBC
.public sub_0202DED8
.public sub_0202DEF8
.public sub_0202DF7C
.public sub_0202DFAC
.public sub_0202E014
.public sub_0202E024
.public SaveMysteryGift_CardTagIsValid
.public SaveMysteryGift_SpecialCardTagIsValid
.public SaveMysteryGift_HasAnyCard
.public SaveMysteryGift_HasAnyGift
.public SaveMysteryGift_ReceivedFlagTest
.public SaveMysteryGift_ReceivedFlagSet
.public SaveMysteryGift_TestFlagx7FF
.public SaveMysteryGift_SetFlagx7FF
.public sub_0202EC14
.public sub_0202EC28
.public sub_0202EC98
Expand Down
12 changes: 6 additions & 6 deletions asm/include/scrcmd_11.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,12 +30,12 @@
.public GiveOrTakeSeal
.public SealCase_CheckSealQuantity
.public Save_SpecialRibbons_Get
.public GetStaticPointerToSaveMysteryGift
.public DeleteStaticPointerToMysteryGift
.public GetFirstQueuedMysteryGiftIdx
.public GetMysteryGiftTagByIdx
.public GetMysteryGiftDataByIdx
.public SetMysteryGiftReceivedByIdx
.public SaveMGDataPtr_Begin
.public SaveMGDataPtr_End
.public SaveMGDataPtr_GetFirstGiftIndex
.public SaveMGDataPtr_GetTagByIndex
.public SaveMGDataPtr_GetDataByIndex
.public SaveMGDataPtr_SetReceivedByIndex
.public UpdatePokedexWithReceivedSpecies
.public Save_PhotoAlbum_Get
.public PhotoAlbum_GetIndexOfFirstEmptySlot
Expand Down
26 changes: 13 additions & 13 deletions asm/include/unk_0202DBA8.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@
.public Save_MysteryGift_sizeof
.public Save_MysteryGift_Init
.public SaveMysteryGift_CardGetByIdx
.public sub_0202DC2C
.public sub_0202DCAC
.public sub_0202DD48
.public sub_0202DDB0
.public sub_0202DDEC
.public SaveMysteryGift_TryInsertGift
.public SaveMysteryGift_TryInsertCard
.public SaveMysteryGift_TrySetSpecialCard
.public SaveMysteryGift_ReceiveGiftAndClearCardByIndex
.public SaveMysteryGift_DeleteWonderCardByIndex
.public SaveMysteryGift_FindAvailable
.public SaveMysteryGift_CardFindAvailable
.public sub_0202DE90
.public sub_0202DEBC
.public sub_0202DED8
.public sub_0202DEF8
.public sub_0202DF7C
.public sub_0202DFAC
.public sub_0202E014
.public sub_0202E024
.public SaveMysteryGift_CardTagIsValid
.public SaveMysteryGift_SpecialCardTagIsValid
.public SaveMysteryGift_HasAnyCard
.public SaveMysteryGift_HasAnyGift
.public SaveMysteryGift_ReceivedFlagTest
.public SaveMysteryGift_ReceivedFlagSet
.public SaveMysteryGift_TestFlagx7FF
.public SaveMysteryGift_SetFlagx7FF
.public GetStaticPointerToSaveMysteryGift
.public DeleteStaticPointerToMysteryGift
.public GetFirstQueuedMysteryGiftIdx
Expand Down
36 changes: 18 additions & 18 deletions asm/overlay_74_thumb.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -892,7 +892,7 @@ _022276D8:
mov r0, #0
str r0, [r4, #0x40]
ldr r0, [r4, #0x14]
bl sub_0202E014
bl SaveMysteryGift_TestFlagx7FF
cmp r0, #1
bne _0222779A
ldr r1, [r4, #0x40]
Expand Down Expand Up @@ -2120,7 +2120,7 @@ ov74_MainMenu_PrintMysteryGiftButton: ; 0x022280B4
cmp r0, #0
bne _022280FC
ldr r0, [r5, #0x14]
bl sub_0202E014
bl SaveMysteryGift_TestFlagx7FF
cmp r0, #1
bne _022280D4
mov r0, #1
Expand Down Expand Up @@ -2179,7 +2179,7 @@ _0222810C:
orr r0, r1
str r0, [r5, #0x38]
ldr r0, [r5, #0x14]
bl sub_0202E024
bl SaveMysteryGift_SetFlagx7FF
add sp, #8
mov r0, #1
pop {r3, r4, r5, r6, r7, pc}
Expand Down Expand Up @@ -4656,7 +4656,7 @@ ov74_0222947C: ; 0x0222947C
add r1, r4, #0
ldr r0, [r5, r0]
mov r2, #3
bl sub_0202DC2C
bl SaveMysteryGift_TryInsertGift
mov r0, #1
mov r1, #0
bl GfGfx_EngineBTogglePlanes
Expand Down Expand Up @@ -6258,7 +6258,7 @@ _0222A1CE:
add r1, #0x4c
ldrh r1, [r1]
add r7, r0, #0
bl sub_0202DFAC
bl SaveMysteryGift_ReceivedFlagSet
add r4, #0x4e
ldrb r0, [r4]
lsl r0, r0, #0x1d
Expand All @@ -6274,20 +6274,20 @@ _0222A1CE:
bne _0222A204
add r0, r7, #0
add r1, r5, #0
bl sub_0202DD48
bl SaveMysteryGift_TrySetSpecialCard
b _0222A21C
_0222A204:
cmp r6, #0
bne _0222A214
add r0, r7, #0
add r1, r5, #0
mov r2, #3
bl sub_0202DC2C
bl SaveMysteryGift_TryInsertGift
b _0222A21C
_0222A214:
add r0, r7, #0
add r1, r5, #0
bl sub_0202DCAC
bl SaveMysteryGift_TryInsertCard
_0222A21C:
ldr r0, [sp]
bl ov74_022360A0
Expand Down Expand Up @@ -7229,7 +7229,7 @@ ov74_0222A94C: ; 0x0222A94C
add r5, r5, #1
str r2, [sp, #0x24]
str r1, [sp, #0x28]
bl sub_0202DED8
bl SaveMysteryGift_HasAnyCard
cmp r0, #0
beq _0222A992
lsl r6, r5, #3
Expand All @@ -7244,7 +7244,7 @@ ov74_0222A94C: ; 0x0222A94C
str r2, [r1, #4]
_0222A992:
ldr r0, [sp, #0x18]
bl sub_0202DEBC
bl SaveMysteryGift_SpecialCardTagIsValid
cmp r0, #0
beq _0222A9B0
lsl r6, r5, #3
Expand Down Expand Up @@ -12330,7 +12330,7 @@ ov74_0222D308: ; 0x0222D308
ldr r0, [r4, r1]
add r1, #0x20
ldr r1, [r4, r1]
bl sub_0202DEF8
bl SaveMysteryGift_HasAnyGift
cmp r0, #1
ldr r0, _0222D350 ; =0x00002BD0
bne _0222D330
Expand Down Expand Up @@ -12378,20 +12378,20 @@ ov74_0222D358: ; 0x0222D358
ldr r0, [r4, r1]
add r1, #0x20
ldr r1, [r4, r1]
bl sub_0202DEF8
bl SaveMysteryGift_HasAnyGift
cmp r0, #1
ldr r1, _0222D408 ; =0x00002BA0
bne _0222D39A
ldr r0, [r4, r1]
add r1, #0x20
ldr r1, [r4, r1]
bl sub_0202DDB0
bl SaveMysteryGift_ReceiveGiftAndClearCardByIndex
b _0222D3A4
_0222D39A:
ldr r0, [r4, r1]
add r1, #0x20
ldr r1, [r4, r1]
bl sub_0202DDEC
bl SaveMysteryGift_DeleteWonderCardByIndex
_0222D3A4:
ldr r0, _0222D40C ; =0x00002BA4
ldr r0, [r4, r0]
Expand All @@ -12401,7 +12401,7 @@ _0222D3A4:
bl sub_0200F450
ldr r0, _0222D408 ; =0x00002BA0
ldr r0, [r4, r0]
bl sub_0202DED8
bl SaveMysteryGift_HasAnyCard
cmp r0, #0
bne _0222D3C4
mov r0, #0x1b
Expand Down Expand Up @@ -12571,7 +12571,7 @@ _0222D50C:
ldr r0, [r4, r0]
cmp r0, #0
beq _0222D51C
bl sub_0202DEF8
bl SaveMysteryGift_HasAnyGift
cmp r0, #1
bne _0222D520
_0222D51C:
Expand Down Expand Up @@ -13346,7 +13346,7 @@ _0222DB14:
ldr r0, _0222DB2C ; =0x00002BA0
add r1, r4, #0
ldr r0, [r5, r0]
bl sub_0202DE90
bl SaveMysteryGift_CardTagIsValid
cmp r0, #0
beq _0222DB02
_0222DB26:
Expand Down Expand Up @@ -17618,7 +17618,7 @@ _0222FDF2:
cmp r0, #1
bne _0222FE0E
add r0, r6, #0
bl sub_0202DF7C
bl SaveMysteryGift_ReceivedFlagTest
cmp r0, #1
bne _0222FE0E
mov r0, #2
Expand Down
18 changes: 9 additions & 9 deletions asm/scrcmd_11.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,24 +37,24 @@ FieldSystem_InitGetMysteryGiftGmmState: ; 0x0204BD78
thumb_func_start FieldSystem_GetTagOfNextMG
FieldSystem_GetTagOfNextMG: ; 0x0204BD80
push {r3, lr}
bl GetFirstQueuedMysteryGiftIdx
bl GetMysteryGiftTagByIdx
bl SaveMGDataPtr_GetFirstGiftIndex
bl SaveMGDataPtr_GetTagByIndex
pop {r3, pc}
thumb_func_end FieldSystem_GetTagOfNextMG

thumb_func_start FieldSystem_GetDataOfNextMG
FieldSystem_GetDataOfNextMG: ; 0x0204BD8C
push {r3, lr}
bl GetFirstQueuedMysteryGiftIdx
bl GetMysteryGiftDataByIdx
bl SaveMGDataPtr_GetFirstGiftIndex
bl SaveMGDataPtr_GetDataByIndex
pop {r3, pc}
thumb_func_end FieldSystem_GetDataOfNextMG

thumb_func_start FieldSystem_SetQueuedMGReceived
FieldSystem_SetQueuedMGReceived: ; 0x0204BD98
push {r3, lr}
bl GetFirstQueuedMysteryGiftIdx
bl SetMysteryGiftReceivedByIdx
bl SaveMGDataPtr_GetFirstGiftIndex
bl SaveMGDataPtr_SetReceivedByIndex
pop {r3, pc}
thumb_func_end FieldSystem_SetQueuedMGReceived

Expand Down Expand Up @@ -90,23 +90,23 @@ _0204BDD2:
ldr r0, [r4]
mov r1, #0x20
ldr r0, [r0, #0xc]
bl GetStaticPointerToSaveMysteryGift
bl SaveMGDataPtr_Begin
b _0204BF8C
_0204BDE0:
; End
add r4, #0x80
ldr r0, [r4]
mov r1, #0
ldr r0, [r0, #0xc]
bl DeleteStaticPointerToMysteryGift
bl SaveMGDataPtr_End
b _0204BF8C
_0204BDEE:
; End.2
add r4, #0x80
ldr r0, [r4]
mov r1, #1
ldr r0, [r0, #0xc]
bl DeleteStaticPointerToMysteryGift
bl SaveMGDataPtr_End
b _0204BF8C
_0204BDFC:
; Check bool
Expand Down
Loading