diff options
| -rw-r--r-- | data/data_83760F0.s | 3 | ||||
| -rw-r--r-- | ld_script.txt | 1 | ||||
| -rw-r--r-- | src/lottery_corner.c | 12 |
3 files changed, 11 insertions, 5 deletions
diff --git a/data/data_83760F0.s b/data/data_83760F0.s index b32e275b3..9cf42de35 100644 --- a/data/data_83760F0.s +++ b/data/data_83760F0.s @@ -19507,6 +19507,3 @@ gSpriteAnimTable_840CAE0:: @ 840CAE0 .align 2 gSpriteTemplate_840CAEC:: @ 840CAEC spr_template 1001, 1001, gOamData_840CAC0, gSpriteAnimTable_840CAE0, NULL, gDummySpriteAffineAnimTable, sub_814580C - -gUnknown_0840CB04:: @ 840CB04 - .incbin "baserom.gba", 0x0040cb04, 0x8 diff --git a/ld_script.txt b/ld_script.txt index 475e03daa..b668717ee 100644 --- a/ld_script.txt +++ b/ld_script.txt @@ -330,6 +330,7 @@ SECTIONS { src/palette.o(.rodata); src/sound.o(.rodata); data/data_83760F0.o(.rodata); + src/lottery_corner.o(.rodata); data/diploma.o(.rodata); data/strings.o(.rodata); data/berry_tag_screen.o(.rodata); diff --git a/src/lottery_corner.c b/src/lottery_corner.c index 4d80f86c2..c18aeef48 100644 --- a/src/lottery_corner.c +++ b/src/lottery_corner.c @@ -4,17 +4,25 @@ #include "string_util.h" #include "event_data.h" #include "species.h" +#include "items.h" extern u16 gScriptResult; extern u16 gSpecialVar_0x8004; extern struct Pokemon gPlayerParty[6]; extern struct PokemonStorage gPokemonStorage; extern u16 gSpecialVar_0x8005; -extern u16 gUnknown_0840CB04[]; extern u16 gSpecialVar_0x8006; static EWRAM_DATA u16 sWinNumberDigit = 0; static EWRAM_DATA u16 sOtIdDigit = 0; +static const u16 sLotteryPrizes[] = +{ + ITEM_PP_UP, + ITEM_EXP_SHARE, + ITEM_MAX_REVIVE, + ITEM_MASTER_BALL, +}; + static u8 GetMatchingDigits(u16, u16); void ResetLotteryCorner(void) @@ -103,7 +111,7 @@ void PickLotteryCornerTicket(void) if(gSpecialVar_0x8004 != 0) { - gSpecialVar_0x8005 = gUnknown_0840CB04[gSpecialVar_0x8004 - 1]; + gSpecialVar_0x8005 = sLotteryPrizes[gSpecialVar_0x8004 - 1]; if(box == 14) { |