(bonusclaim) Extract data

This commit is contained in:
Eebit 2023-03-22 22:18:22 -04:00
parent eef2989a85
commit 58a5a59def
5 changed files with 219 additions and 268 deletions

View File

@ -668,264 +668,3 @@ gUnknown_08A21568: @ 0x08A21568
@ PROC_END @ PROC_END
.short 0x0, 0x0 .short 0x0, 0x0
.word 0x0 .word 0x0
.global gUnknown_08A21590
gUnknown_08A21590: @ 0x08A21590
@ replacing .incbin "baserom.gba", 0x00a21590, 0x4
.4byte gUnknown_02000948 + 0x20
.global gUnknown_08A21594
gUnknown_08A21594: @ 0x08A21594
@ replacing .incbin "baserom.gba", 0x00a21594, 0x4
.4byte gUnknown_02000C78 + 0xf0
.global gUnknown_08A21598
gUnknown_08A21598: @ 0x08A21598
@ replacing .incbin "baserom.gba", 0x00a21598, 0x4
.4byte gUnknown_02001088 + 0xe0
.global gUnknown_08A2159C
gUnknown_08A2159C: @ 0x08A2159C
@ replacing .incbin "baserom.gba", 0x00a2159c, 0x4
.4byte gUnknown_02001188 + 0x3e0
.global gUnknown_08A215A0
gUnknown_08A215A0: @ 0x08A215A0
@ replacing .incbin "baserom.gba", 0x00a215a0, 0x4
.4byte gUnknown_02001188 + 0x4e0
.global gUnknown_08A215A4
gUnknown_08A215A4: @ 0x08A215A4
@ replacing .incbin "baserom.gba", 0x00a215a4, 0x4
.4byte gUnknown_02001188 + 0x1e0
.global gUnknown_08A215A8
gUnknown_08A215A8: @ 0x08A215A8
@ PROC_YIELD
.short 0xe, 0x0
.word 0x0
@ PROC_CALL
.short 0x2, 0x0
.word sub_80B0ADC
@ PROC_CALL_ARG
.short 0x18, 0x8
.word NewFadeIn
@ PROC_WHILE
.short 0x14, 0x0
.word FadeInExists
@ PROC_LABEL
.short 0xb, 0x0
.word 0x0
@ PROC_REPEAT
.short 0x3, 0x0
.word sub_80B0D38
@ PROC_GOTO
.short 0xc, 0x64
.word 0x0
@ PROC_LABEL
.short 0xb, 0x1
.word 0x0
@ PROC_CALL
.short 0x2, 0x0
.word sub_80B1020
@ PROC_REPEAT
.short 0x3, 0x0
.word sub_80B1288
@ PROC_CALL
.short 0x2, 0x0
.word sub_80B1350
@ PROC_GOTO
.short 0xc, 0x0
.word 0x0
@ PROC_LABEL
.short 0xb, 0x2
.word 0x0
@ PROC_CALL
.short 0x2, 0x0
.word sub_80B13BC
@ PROC_REPEAT
.short 0x3, 0x0
.word sub_80B15E8
@ PROC_CALL
.short 0x2, 0x0
.word sub_80B1620
@ PROC_GOTO
.short 0xc, 0x0
.word 0x0
@ PROC_LABEL
.short 0xb, 0x64
.word 0x0
@ PROC_CALL_ARG
.short 0x18, 0x8
.word NewFadeOut
@ PROC_WHILE
.short 0x14, 0x0
.word FadeOutExists
@ PROC_CALL
.short 0x2, 0x0
.word sub_80B166C
@ PROC_END
.short 0x0, 0x0
.word 0x0
.global gUnknown_08A21658
gUnknown_08A21658: @ 0x08A21658
.incbin "baserom.gba", 0xA21658, 0x4774
.global gUnknown_08A25DCC
gUnknown_08A25DCC: @ 0x08A25DCC
.incbin "baserom.gba", 0xA25DCC, 0x100
.global gUnknown_08A25ECC
gUnknown_08A25ECC: @ 0x08A25ECC
.incbin "baserom.gba", 0xA25ECC, 0x4B4
.global gUnknown_08A26380
gUnknown_08A26380: @ 0x08A26380
.incbin "baserom.gba", 0xA26380, 0x558
.global gUnknown_08A268D8
gUnknown_08A268D8: @ 0x08A268D8
.incbin "baserom.gba", 0xA268D8, 0x20
.global gUnknown_08A268F8
gUnknown_08A268F8: @ 0x08A268F8
.incbin "baserom.gba", 0xA268F8, 0x17C
.global Img_SaveScreenSprits
Img_SaveScreenSprits: @ 0x08A26A74
.incbin "baserom.gba", 0xA26A74, 0x14F4
.global Pal_SaveScreenSprits
Pal_SaveScreenSprits: @ 0x08A27F68
.incbin "baserom.gba", 0xA27F68, 0x120
.global gUnknown_08A28088
gUnknown_08A28088: @ 0x08A28088
.incbin "baserom.gba", 0xA28088, 0x20
.global gUnknown_08A280A8
gUnknown_08A280A8: @ 0x08A280A8
.incbin "baserom.gba", 0xA280A8, 0x84
.global Img_GameMainMenuObjs
Img_GameMainMenuObjs: @ 0x08A2812C
.incbin "baserom.gba", 0xA2812C, 0x8E0
.global Img_DifficultyMenuObjs
Img_DifficultyMenuObjs: @ 0x08A28A0C
.incbin "baserom.gba", 0xA28A0C, 0xA0C
.global Pal_DifficultyMenuObjs
Pal_DifficultyMenuObjs: @ 0x08A29418
.incbin "baserom.gba", 0xA29418, 0x82
.global gUnknown_08A2949A
gUnknown_08A2949A: @ 0x08A2949A
.incbin "baserom.gba", 0xA2949A, 0x20
.global gUnknown_08A294BA
gUnknown_08A294BA: @ 0x08A294BA
.incbin "baserom.gba", 0xA294BA, 0x9E
.global gUnknown_08A29558
gUnknown_08A29558: @ 0x08A29558
.incbin "baserom.gba", 0xA29558, 0x5C
.global gUnknown_08A295B4
gUnknown_08A295B4: @ 0x08A295B4
.incbin "baserom.gba", 0xA295B4, 0x20
.global gUnknown_08A295D4
gUnknown_08A295D4: @ 0x08A295D4
.incbin "baserom.gba", 0xA295D4, 0x4B4
.global gUnknown_08A29A88
gUnknown_08A29A88: @ 0x08A29A88
.incbin "baserom.gba", 0xA29A88, 0x175C
.global gUnknown_08A2B1E4
gUnknown_08A2B1E4: @ 0x08A2B1E4
.incbin "baserom.gba", 0xA2B1E4, 0xF38
.global gUnknown_08A2C11C
gUnknown_08A2C11C: @ 0x08A2C11C
.incbin "baserom.gba", 0xA2C11C, 0x120
.global gUnknown_08A2C23C
gUnknown_08A2C23C: @ 0x08A2C23C
.incbin "baserom.gba", 0xA2C23C, 0x28C
.global gUnknown_08A2C4C8
gUnknown_08A2C4C8: @ 0x08A2C4C8
.incbin "baserom.gba", 0xA2C4C8, 0xE0
.global gUnknown_08A2C5A8
gUnknown_08A2C5A8: @ 0x08A2C5A8
.incbin "baserom.gba", 0xA2C5A8, 0x1FC
.global gUnknown_08A2C7A4
gUnknown_08A2C7A4: @ 0x08A2C7A4
.incbin "baserom.gba", 0xA2C7A4, 0x94
.global gUnknown_08A2C838
gUnknown_08A2C838: @ 0x08A2C838
.incbin "baserom.gba", 0xA2C838, 0x70
.global gUnknown_08A2C8A8
gUnknown_08A2C8A8: @ 0x08A2C8A8
.incbin "baserom.gba", 0xA2C8A8, 0x60
.global gUnknown_08A2C908
gUnknown_08A2C908: @ 0x08A2C908
.incbin "baserom.gba", 0xA2C908, 0x24
.global gUnknown_08A2C92C
gUnknown_08A2C92C: @ 0x08A2C92C
.incbin "baserom.gba", 0xA2C92C, 0x190
.global gUnknown_08A2CABC
gUnknown_08A2CABC: @ 0x08A2CABC
.incbin "baserom.gba", 0xA2CABC, 0x810
.global gUnknown_08A2D2CC
gUnknown_08A2D2CC: @ 0x08A2D2CC
.incbin "baserom.gba", 0xA2D2CC, 0x60
.global gUnknown_08A2D32C
gUnknown_08A2D32C: @ 0x08A2D32C
.incbin "baserom.gba", 0xA2D32C, 0xE8C
.global gUnknown_08A2E1B8
gUnknown_08A2E1B8: @ 0x08A2E1B8
.incbin "baserom.gba", 0xA2E1B8, 0x40
.global gUnknown_08A2E1F8
gUnknown_08A2E1F8: @ 0x08A2E1F8
.incbin "baserom.gba", 0xA2E1F8, 0x1C
.global gUnknown_08A2E214
gUnknown_08A2E214: @ 0x08A2E214
.incbin "baserom.gba", 0xA2E214, 0x290
.global gUnknown_08A2E4A4
gUnknown_08A2E4A4: @ 0x08A2E4A4
.incbin "baserom.gba", 0xA2E4A4, 0x20
.global gUnknown_08A2E4C4
gUnknown_08A2E4C4: @ 0x08A2E4C4
.incbin "baserom.gba", 0xA2E4C4, 0x128
.global gUnknown_08A2E5EC
gUnknown_08A2E5EC: @ 0x08A2E5EC
.incbin "baserom.gba", 0xA2E5EC, 0x304
.global gUnknown_08A2E8F0
gUnknown_08A2E8F0: @ 0x08A2E8F0
.incbin "baserom.gba", 0xA2E8F0, 0x60
.global gUnknown_08A2E950
gUnknown_08A2E950: @ 0x08A2E950
.incbin "baserom.gba", 0xA2E950, 0x24

161
data/data_A21658.s Normal file
View File

@ -0,0 +1,161 @@
.section .data
.global gUnknown_08A21658
gUnknown_08A21658: @ 0x08A21658
.incbin "baserom.gba", 0xA21658, 0x4774
.global gUnknown_08A25DCC
gUnknown_08A25DCC: @ 0x08A25DCC
.incbin "baserom.gba", 0xA25DCC, 0x100
.global gUnknown_08A25ECC
gUnknown_08A25ECC: @ 0x08A25ECC
.incbin "baserom.gba", 0xA25ECC, 0x4B4
.global gUnknown_08A26380
gUnknown_08A26380: @ 0x08A26380
.incbin "baserom.gba", 0xA26380, 0x558
.global gUnknown_08A268D8
gUnknown_08A268D8: @ 0x08A268D8
.incbin "baserom.gba", 0xA268D8, 0x20
.global gUnknown_08A268F8
gUnknown_08A268F8: @ 0x08A268F8
.incbin "baserom.gba", 0xA268F8, 0x17C
.global Img_SaveScreenSprits
Img_SaveScreenSprits: @ 0x08A26A74
.incbin "baserom.gba", 0xA26A74, 0x14F4
.global Pal_SaveScreenSprits
Pal_SaveScreenSprits: @ 0x08A27F68
.incbin "baserom.gba", 0xA27F68, 0x120
.global gUnknown_08A28088
gUnknown_08A28088: @ 0x08A28088
.incbin "baserom.gba", 0xA28088, 0x20
.global gUnknown_08A280A8
gUnknown_08A280A8: @ 0x08A280A8
.incbin "baserom.gba", 0xA280A8, 0x84
.global Img_GameMainMenuObjs
Img_GameMainMenuObjs: @ 0x08A2812C
.incbin "baserom.gba", 0xA2812C, 0x8E0
.global Img_DifficultyMenuObjs
Img_DifficultyMenuObjs: @ 0x08A28A0C
.incbin "baserom.gba", 0xA28A0C, 0xA0C
.global Pal_DifficultyMenuObjs
Pal_DifficultyMenuObjs: @ 0x08A29418
.incbin "baserom.gba", 0xA29418, 0x82
.global gUnknown_08A2949A
gUnknown_08A2949A: @ 0x08A2949A
.incbin "baserom.gba", 0xA2949A, 0x20
.global gUnknown_08A294BA
gUnknown_08A294BA: @ 0x08A294BA
.incbin "baserom.gba", 0xA294BA, 0x9E
.global gUnknown_08A29558
gUnknown_08A29558: @ 0x08A29558
.incbin "baserom.gba", 0xA29558, 0x5C
.global gUnknown_08A295B4
gUnknown_08A295B4: @ 0x08A295B4
.incbin "baserom.gba", 0xA295B4, 0x20
.global gUnknown_08A295D4
gUnknown_08A295D4: @ 0x08A295D4
.incbin "baserom.gba", 0xA295D4, 0x4B4
.global gUnknown_08A29A88
gUnknown_08A29A88: @ 0x08A29A88
.incbin "baserom.gba", 0xA29A88, 0x175C
.global gUnknown_08A2B1E4
gUnknown_08A2B1E4: @ 0x08A2B1E4
.incbin "baserom.gba", 0xA2B1E4, 0xF38
.global gUnknown_08A2C11C
gUnknown_08A2C11C: @ 0x08A2C11C
.incbin "baserom.gba", 0xA2C11C, 0x120
.global gUnknown_08A2C23C
gUnknown_08A2C23C: @ 0x08A2C23C
.incbin "baserom.gba", 0xA2C23C, 0x28C
.global gUnknown_08A2C4C8
gUnknown_08A2C4C8: @ 0x08A2C4C8
.incbin "baserom.gba", 0xA2C4C8, 0xE0
.global gUnknown_08A2C5A8
gUnknown_08A2C5A8: @ 0x08A2C5A8
.incbin "baserom.gba", 0xA2C5A8, 0x1FC
.global gUnknown_08A2C7A4
gUnknown_08A2C7A4: @ 0x08A2C7A4
.incbin "baserom.gba", 0xA2C7A4, 0x94
.global gUnknown_08A2C838
gUnknown_08A2C838: @ 0x08A2C838
.incbin "baserom.gba", 0xA2C838, 0x70
.global gUnknown_08A2C8A8
gUnknown_08A2C8A8: @ 0x08A2C8A8
.incbin "baserom.gba", 0xA2C8A8, 0x60
.global gUnknown_08A2C908
gUnknown_08A2C908: @ 0x08A2C908
.incbin "baserom.gba", 0xA2C908, 0x24
.global gUnknown_08A2C92C
gUnknown_08A2C92C: @ 0x08A2C92C
.incbin "baserom.gba", 0xA2C92C, 0x190
.global gUnknown_08A2CABC
gUnknown_08A2CABC: @ 0x08A2CABC
.incbin "baserom.gba", 0xA2CABC, 0x810
.global gUnknown_08A2D2CC
gUnknown_08A2D2CC: @ 0x08A2D2CC
.incbin "baserom.gba", 0xA2D2CC, 0x60
.global gUnknown_08A2D32C
gUnknown_08A2D32C: @ 0x08A2D32C
.incbin "baserom.gba", 0xA2D32C, 0xE8C
.global gUnknown_08A2E1B8
gUnknown_08A2E1B8: @ 0x08A2E1B8
.incbin "baserom.gba", 0xA2E1B8, 0x40
.global gUnknown_08A2E1F8
gUnknown_08A2E1F8: @ 0x08A2E1F8
.incbin "baserom.gba", 0xA2E1F8, 0x1C
.global gUnknown_08A2E214
gUnknown_08A2E214: @ 0x08A2E214
.incbin "baserom.gba", 0xA2E214, 0x290
.global gUnknown_08A2E4A4
gUnknown_08A2E4A4: @ 0x08A2E4A4
.incbin "baserom.gba", 0xA2E4A4, 0x20
.global gUnknown_08A2E4C4
gUnknown_08A2E4C4: @ 0x08A2E4C4
.incbin "baserom.gba", 0xA2E4C4, 0x128
.global gUnknown_08A2E5EC
gUnknown_08A2E5EC: @ 0x08A2E5EC
.incbin "baserom.gba", 0xA2E5EC, 0x304
.global gUnknown_08A2E8F0
gUnknown_08A2E8F0: @ 0x08A2E8F0
.incbin "baserom.gba", 0xA2E8F0, 0x60
.global gUnknown_08A2E950
gUnknown_08A2E950: @ 0x08A2E950
.incbin "baserom.gba", 0xA2E950, 0x24

View File

@ -483,6 +483,8 @@ SECTIONS
. = ALIGN(4); data/data_A20050.o(.data); . = ALIGN(4); data/data_A20050.o(.data);
. = ALIGN(4); src/savedrawcursor.o(.data); . = ALIGN(4); src/savedrawcursor.o(.data);
. = ALIGN(4); data/data_A2077C.o(.data); . = ALIGN(4); data/data_A2077C.o(.data);
. = ALIGN(4); src/bonusclaim.o(.data);
. = ALIGN(4); data/data_A21658.o(.data);
. = ALIGN(4); src/uiconfig.o(.data); . = ALIGN(4); src/uiconfig.o(.data);
. = ALIGN(4); data/data_A2EE90.o(.data); . = ALIGN(4); data/data_A2EE90.o(.data);
. = ALIGN(4); src/opinfo.o(.data); . = ALIGN(4); src/opinfo.o(.data);

View File

@ -43,12 +43,19 @@ struct BonusClaimItemEnt {
/* 01 */ s8 unk_01; /* 01 */ s8 unk_01;
}; };
extern struct BonusClaimEnt* gUnknown_08A21590; // gpBonusClaimData extern struct BonusClaimEnt gUnknown_02000968[];
extern struct BonusClaimEnt* gUnknown_08A21594; // gpBonusClaimDataUpdated extern struct BonusClaimEnt gUnknown_02000D68[];
extern struct BonusClaimItemEnt* gUnknown_08A21598; // gpBonusClaimItemList extern struct BonusClaimItemEnt gUnknown_02001168[];
extern int* gUnknown_08A2159C; // gpBonusClaimItemCount extern struct Unknown8A215A4 gUnknown_02001368[];
extern struct TextHandle* gUnknown_08A215A0; extern int gUnknown_02001568;
extern struct Unknown8A215A4* gUnknown_08A215A4; extern struct TextHandle gUnknown_02001668[];
struct BonusClaimEnt* CONST_DATA gUnknown_08A21590 = gUnknown_02000968; // gpBonusClaimData
struct BonusClaimEnt* CONST_DATA gUnknown_08A21594 = gUnknown_02000D68; // gpBonusClaimDataUpdated
struct BonusClaimItemEnt* CONST_DATA gUnknown_08A21598 = gUnknown_02001168; // gpBonusClaimItemList
int* CONST_DATA gUnknown_08A2159C = &gUnknown_02001568; // gpBonusClaimItemCount
struct TextHandle* CONST_DATA gUnknown_08A215A0 = gUnknown_02001668;
struct Unknown8A215A4* CONST_DATA gUnknown_08A215A4 = gUnknown_02001368;
extern u16 gUnknown_02023CC0[]; extern u16 gUnknown_02023CC0[];
extern u16 gUnknown_02022CC4[]; extern u16 gUnknown_02022CC4[];
@ -1020,7 +1027,43 @@ void sub_80B166C(struct BonusClaimProc* proc) {
return; return;
} }
extern struct ProcCmd gUnknown_08A215A8[]; struct ProcCmd CONST_DATA gUnknown_08A215A8[] = {
PROC_SLEEP(0),
PROC_CALL(sub_80B0ADC),
PROC_CALL_ARG(NewFadeIn, 8),
PROC_WHILE(FadeInExists),
// fallthrough
PROC_LABEL(0),
PROC_REPEAT(sub_80B0D38),
PROC_GOTO(100),
PROC_LABEL(1),
PROC_CALL(sub_80B1020),
PROC_REPEAT(sub_80B1288),
PROC_CALL(sub_80B1350),
PROC_GOTO(0),
PROC_LABEL(2),
PROC_CALL(sub_80B13BC),
PROC_REPEAT(sub_80B15E8),
PROC_CALL(sub_80B1620),
PROC_GOTO(0),
PROC_LABEL(100),
PROC_CALL_ARG(NewFadeOut, 8),
PROC_WHILE(FadeOutExists),
PROC_CALL(sub_80B166C),
PROC_END,
};
//! FE8U = 0x080B1688 //! FE8U = 0x080B1688
void StartBonusClaimScreen(ProcPtr parent) { void StartBonusClaimScreen(ProcPtr parent) {

View File

@ -31,14 +31,20 @@
. = 0x000940; gUnknown_02000940 = .; . = 0x000940; gUnknown_02000940 = .;
. = 0x000944; gUnknown_02000944 = .; . = 0x000944; gUnknown_02000944 = .;
. = 0x000948; gUnknown_02000948 = .; . = 0x000948; gUnknown_02000948 = .;
. = 0x000968; gUnknown_02000968 = .;
. = 0x000C60; gUnknown_02000C60 = .; . = 0x000C60; gUnknown_02000C60 = .;
. = 0x000C78; gUnknown_02000C78 = .; . = 0x000C78; gUnknown_02000C78 = .;
. = 0x000D68; gUnknown_02000D68 = .;
. = 0x000F00; gUnknown_02000F00 = .; . = 0x000F00; gUnknown_02000F00 = .;
. = 0x001000; gBmMapBuffer = .; . = 0x001000; gBmMapBuffer = .;
. = 0x001088; gUnknown_02001088 = .; . = 0x001088; gUnknown_02001088 = .;
. = 0x001168; gUnknown_02001168 = .;
. = 0x001180; gUnknown_02001180 = .; . = 0x001180; gUnknown_02001180 = .;
. = 0x001184; gUnknown_02001184 = .; . = 0x001184; gUnknown_02001184 = .;
. = 0x001188; gUnknown_02001188 = .; . = 0x001188; gUnknown_02001188 = .;
. = 0x001368; gUnknown_02001368 = .;
. = 0x001568; gUnknown_02001568 = .;
. = 0x001668; gUnknown_02001668 = .;
. = 0x001F70; gConvoyItemCount = .; . = 0x001F70; gConvoyItemCount = .;
. = 0x002038; gUnknown_02002038 = .; . = 0x002038; gUnknown_02002038 = .;
. = 0x002088; gUnknown_02002088 = .; . = 0x002088; gUnknown_02002088 = .;