mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-12-26 19:54:21 +01:00
Move berry crush data to src
This commit is contained in:
GriffinR
huderlem
parent
f6275cce57
commit
3456578c0f
@ -1,363 +0,0 @@
|
||||
.include "asm/macros.inc"
|
||||
.include "constants/constants.inc"
|
||||
|
||||
.section .rodata
|
||||
|
||||
.align 2
|
||||
gUnknown_082F325C:: @ 82F325C
|
||||
.byte 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80
|
||||
|
||||
.align 2
|
||||
gUnknown_082F3264:: @ 82F3264
|
||||
.byte 0x00, 0x01, 0x02, 0x03, 0x05, 0x00, 0x00, 0x00
|
||||
|
||||
.align 2
|
||||
gUnknown_082F326C:: @ 82F326C
|
||||
.byte 0x04, 0x01, 0x00, 0xff, 0x00, 0x00, 0x00, 0x04
|
||||
.byte 0x02, 0x00, 0xff, 0x00, 0x00, 0x00, 0x04, 0x02
|
||||
.byte 0x00, 0xfe, 0x00, 0x00, 0x00, 0x06, 0x03, 0x01
|
||||
.byte 0xff, 0xfd, 0xff, 0x00, 0x06, 0x04, 0x01, 0xfe
|
||||
.byte 0xfc, 0xfe, 0x00, 0x00
|
||||
|
||||
.align 2
|
||||
gUnknown_082F3290:: @ 82F3290
|
||||
.byte 0x03, 0x02, 0x01, 0x00, 0x03, 0x03, 0x01, 0x00
|
||||
.byte 0x03, 0x03, 0x02, 0x00, 0x03, 0x04, 0x02, 0x00
|
||||
.byte 0x03, 0x05, 0x03, 0x00
|
||||
|
||||
.align 2
|
||||
gUnknown_082F32A4:: @ 82F32A4
|
||||
.4byte gText_ReadyToBerryCrush
|
||||
.4byte gText_WaitForAllChooseBerry
|
||||
.4byte gText_EndedWithXUnitsPowder
|
||||
.4byte gText_RecordingGameResults
|
||||
.4byte gText_PlayBerryCrushAgain
|
||||
.4byte gText_YouHaveNoBerries
|
||||
.4byte gText_MemberDroppedOut
|
||||
.4byte gText_TimesUpNoGoodPowder
|
||||
.4byte gText_CommunicationStandby2
|
||||
|
||||
.align 2
|
||||
gUnknown_082F32C8:: @ 82F32C8 struct BgTemplate
|
||||
.4byte 0x000000F8
|
||||
|
||||
.align 2
|
||||
gUnknown_082F32CC:: @ 82F32CC struct BgTemplate? not sure
|
||||
.byte 0xd1, 0x14, 0x00, 0x00, 0xc2, 0x20, 0x00, 0x00
|
||||
.byte 0xb3, 0x30, 0x00, 0x00
|
||||
|
||||
.align 2
|
||||
sBerryCrushTextColors1:: @ 82F32D8
|
||||
.byte 0x01, 0x02, 0x03 @ TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY, TEXT_COLOR_LIGHT_GREY
|
||||
|
||||
sBerryCrushTextColors2:: @ 82F32DB
|
||||
.byte 0x00, 0x01, 0x02 @ TEXT_COLOR_TRANSPARENT, TEXT_COLOR_WHITE, TEXT_COLOR_DARK_GREY
|
||||
|
||||
sBerryCrushTextColors3:: @ 82F32DE
|
||||
.byte 0x00, 0x03, 0x04 @ TEXT_COLOR_TRANSPARENT, TEXT_COLOR_LIGHT_GREY, TEXT_COLOR_RED
|
||||
|
||||
sBerryCrushTextColorTable:: @ 82F32E1
|
||||
.byte 0x01, 0x08, 0x09 @ TEXT_COLOR_WHITE, TEXT_COLOR_BLUE, TEXT_COLOR_LIGHT_BLUE
|
||||
.byte 0x01, 0x06, 0x07 @ TEXT_COLOR_WHITE, TEXT_COLOR_GREEN, TEXT_COLOR_LIGHT_GREEN
|
||||
|
||||
sBerryCrushTextColors4:: @ 82F32E7
|
||||
.byte 0x01, 0x04, 0x05 @ TEXT_COLOR_WHITE, TEXT_COLOR_RED, TEXT_COLOR_LIGHT_RED
|
||||
|
||||
.align 2
|
||||
gUnknown_082F32EC:: @ 82F32EC
|
||||
window_template 0x00, 0x03, 0x04, 0x18, 0x0d, 0x0f, 0x0001
|
||||
|
||||
.align 2
|
||||
gUnknown_082F32F4:: @ 82F32F4
|
||||
window_template 0x00, 0x00, 0x00, 0x09, 0x02, 0x08, 0x03ed
|
||||
window_template 0x00, 0x00, 0x03, 0x09, 0x02, 0x08, 0x03db
|
||||
window_template 0x00, 0x00, 0x06, 0x09, 0x02, 0x08, 0x03c9
|
||||
window_template 0x00, 0x15, 0x03, 0x09, 0x02, 0x08, 0x03b7
|
||||
window_template 0x00, 0x15, 0x06, 0x09, 0x02, 0x08, 0x03a5
|
||||
null_window_template
|
||||
|
||||
window_template 0x00, 0x05, 0x02, 0x14, 0x10, 0x0f, 0x0001
|
||||
window_template 0x00, 0x05, 0x02, 0x14, 0x10, 0x0f, 0x0001
|
||||
window_template 0x00, 0x04, 0x02, 0x16, 0x10, 0x0f, 0x0001
|
||||
null_window_template
|
||||
|
||||
.align 2
|
||||
gUnknown_082F3344:: @ 82F3344
|
||||
.byte 0x06, 0x08, 0x09, 0x0b, 0x0c, 0x0e, 0x0f, 0x10
|
||||
|
||||
.align 2
|
||||
gUnknown_082F334C:: @ 82F334C
|
||||
.byte 0x80, 0xf0, 0xfa, 0x02, 0x40, 0x78, 0x7d, 0x01
|
||||
.byte 0x20, 0xbc, 0xbe, 0x00, 0x10, 0x5e, 0x5f, 0x00
|
||||
.byte 0x08, 0xaf, 0x2f, 0x00, 0x84, 0xd7, 0x17, 0x00
|
||||
.byte 0xc2, 0xeb, 0x0b, 0x00, 0xe1, 0xf5, 0x05, 0x00
|
||||
|
||||
.align 2
|
||||
gBerryCrushGrinderBasePal:: @ 82F336C
|
||||
.incbin "graphics/link_games/berrycrush_grinder_base.gbapal"
|
||||
|
||||
.align 2
|
||||
gBerryCrushMiscSpritesPal:: @ 82F338C
|
||||
.incbin "graphics/link_games/berrycrush_misc.gbapal"
|
||||
|
||||
.align 2
|
||||
gBerryCrushTimerDigitsPal:: @ 82F33AC
|
||||
.incbin "graphics/link_games/berrycrush_timerdigits.gbapal"
|
||||
|
||||
.align 2
|
||||
gBerryCrushGrinderBaseGfx:: @ 82F33CC
|
||||
.incbin "graphics/link_games/berrycrush_grinder_base.4bpp.lz"
|
||||
|
||||
.align 2
|
||||
gBerryCrushBtnPressGfx:: @ 82F36F8
|
||||
.incbin "graphics/link_games/berrycrush_btnpress.4bpp.lz"
|
||||
|
||||
.align 2
|
||||
gBerryCrushSparkleGfx:: @ 82F3A74
|
||||
.incbin "graphics/link_games/berrycrush_sparkle.4bpp.lz"
|
||||
|
||||
.align 2
|
||||
gBerryCrushTimerDigitsGfx:: @ 82F3BC0
|
||||
.incbin "graphics/link_games/berrycrush_timerdigits.4bpp.lz"
|
||||
|
||||
.align 2
|
||||
gBerryCrushGrinderTopTilemap:: @ 82F3C8C
|
||||
.incbin "graphics/link_games/berrycrush_grinder_top.bin.lz"
|
||||
|
||||
.align 2
|
||||
gBerryCrushContainerCapTilemap:: @ 82F3DBC
|
||||
.incbin "graphics/link_games/berrycrush_container_cap.bin.lz"
|
||||
|
||||
.align 2
|
||||
gBerryCrushBackgroundTilemap:: @ 82F3F54
|
||||
.incbin "graphics/link_games/berrycrush_background.bin.lz"
|
||||
|
||||
.align 2
|
||||
gUnknown_082F417C:: @ 82F417C
|
||||
.byte 0x01, 0x03, 0x00, 0x00, 0x00, 0x00, 0x01, 0x03
|
||||
.byte 0x00, 0x00, 0x01, 0x03, 0x02, 0x04, 0x00, 0x00
|
||||
.byte 0x01, 0x03, 0x02, 0x04
|
||||
|
||||
.align 2
|
||||
gUnknown_082F4190:: @ 82F4190
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0xff
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x03, 0x00
|
||||
.byte 0xe4, 0xff, 0xfc, 0xff, 0xe8, 0xff, 0x10, 0x00
|
||||
.byte 0x02, 0x00, 0x06, 0x00, 0xf0, 0xff, 0x14, 0x00
|
||||
.byte 0xf8, 0xff, 0x10, 0x00, 0x03, 0x14, 0x03, 0x00
|
||||
.byte 0x1c, 0x00, 0xfc, 0xff, 0x20, 0x00, 0xf8, 0xff
|
||||
.byte 0x04, 0x14, 0x06, 0x00, 0x10, 0x00, 0x14, 0x00
|
||||
.byte 0x10, 0x00, 0xf8, 0xff
|
||||
|
||||
.align 2
|
||||
gUnknown_082F41CC:: @ 82F41CC
|
||||
.byte 0x00, 0x00
|
||||
.byte 0xff, 0x00
|
||||
.byte 0x01, 0x01
|
||||
|
||||
gUnknown_082F41D2::
|
||||
.byte 0x00, 0x00
|
||||
.byte 0xf0, 0xfc
|
||||
.byte 0x10, 0xfc
|
||||
.byte 0xf8, 0xfe
|
||||
.byte 0x08, 0xfe
|
||||
.byte 0xe8, 0xf8
|
||||
.byte 0x18, 0xf8
|
||||
.byte 0xe0, 0xf4
|
||||
.byte 0x20, 0xf4
|
||||
.byte 0xd8, 0xf0
|
||||
.byte 0x28, 0xf0
|
||||
|
||||
.align 2
|
||||
gUnknown_082F41E8:: @ 82F41E8
|
||||
.2byte 0x0005, 0x0006, 0x0007, 0x0008, 0x0009, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_082F41F4:: @ 82F41F4
|
||||
.4byte gBerryCrushGrinderBaseGfx
|
||||
.2byte 0x0800, 0x0001
|
||||
|
||||
.4byte gBerryCrushBtnPressGfx
|
||||
.2byte 0x0e00, 0x0002
|
||||
|
||||
.4byte gBerryCrushSparkleGfx
|
||||
.2byte 0x0700, 0x0003
|
||||
|
||||
.align 2
|
||||
gUnknown_082F420C:: @ 82F420C
|
||||
.4byte gBerryCrushTimerDigitsGfx
|
||||
.2byte 0x02c0, 0x0004
|
||||
|
||||
.4byte NULL
|
||||
.2byte 0x0000, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_082F421C:: @ 82F421C
|
||||
.4byte gBerryCrushGrinderBasePal
|
||||
.2byte 0x0001
|
||||
|
||||
.align 2
|
||||
.4byte gBerryCrushMiscSpritesPal
|
||||
.2byte 0x0002
|
||||
|
||||
.align 2
|
||||
gUnknown_082F422C:: @ 82F422C
|
||||
.align 2
|
||||
.4byte gBerryCrushTimerDigitsPal
|
||||
.2byte 0x0004
|
||||
|
||||
.align 2
|
||||
.4byte NULL
|
||||
.2byte 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_082F423C:: @ 82F423C
|
||||
.2byte 0x0000, 0x0000, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_082F4244:: @ 82F4244
|
||||
.2byte 0x0000, 0x0004, 0x0010, 0x0004, 0x0020, 0x0004, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_082F4254:: @ 82F4254
|
||||
.2byte 0x0030, 0x0002, 0x0040, 0x0002, 0x0050, 0x0002, 0x0060, 0x0002
|
||||
.2byte 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_082F4268:: @ 82F4268
|
||||
.2byte 0x0000, 0x0002, 0x0004, 0x0002, 0x0008, 0x0002, 0x000c, 0x0002
|
||||
.2byte 0x0010, 0x0002, 0x0014, 0x0002, 0xfffe, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_082F4284:: @ 82F4284
|
||||
.2byte 0x0018, 0x0004, 0x001c, 0x0004, 0x0020, 0x0004, 0x0024, 0x0004
|
||||
.2byte 0x0028, 0x0004, 0x002c, 0x0004, 0x0030, 0x0004, 0x0034, 0x0004
|
||||
.2byte 0xfffe, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_082F42A8:: @ 82F42A8
|
||||
.2byte 0x0014, 0x0000, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_082F42B0:: @ 82F42B0
|
||||
.2byte 0x0000, 0x0000, 0xffff, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_082F42B8:: @ 82F42B8
|
||||
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x0102, 0x0000
|
||||
.2byte 0x7ffe, 0x0001, 0x0000, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_082F42D0:: @ 82F42D0
|
||||
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x0000, 0x0000, 0x01fe, 0x0000
|
||||
.2byte 0x7ffe, 0x0001, 0x0000, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_082F42E8:: @ 82F42E8
|
||||
.4byte gUnknown_082F423C
|
||||
|
||||
.align 2
|
||||
gUnknown_082F42EC:: @ 82F42EC
|
||||
.4byte gUnknown_082F4244
|
||||
.4byte gUnknown_082F4254
|
||||
|
||||
.align 2
|
||||
gUnknown_082F42F4:: @ 82F42F4
|
||||
.4byte gUnknown_082F4268
|
||||
.4byte gUnknown_082F4284
|
||||
|
||||
.align 2
|
||||
gUnknown_082F42FC:: @ 82F42FC
|
||||
.4byte gUnknown_082F42A8
|
||||
|
||||
.align 2
|
||||
gUnknown_082F4300:: @ 82F4300
|
||||
.4byte gUnknown_082F42B0
|
||||
|
||||
.align 2
|
||||
gUnknown_082F4304:: @ 82F4304
|
||||
.4byte gUnknown_082F42B8
|
||||
.4byte gUnknown_082F42D0
|
||||
|
||||
.align 2
|
||||
gUnknown_082F430C:: @ 82F430C
|
||||
spr_template 0x0001, 0x0001, gOamData_AffineOff_ObjNormal_64x64, gUnknown_082F42E8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
||||
|
||||
.align 2
|
||||
gUnknown_082F4324:: @ 82F4324
|
||||
spr_template 0x0002, 0x0002, gOamData_AffineOff_ObjNormal_32x32, gUnknown_082F42EC, NULL, gDummySpriteAffineAnimTable, sub_8022A20
|
||||
|
||||
.align 2
|
||||
gUnknown_082F433C:: @ 82F433C
|
||||
spr_template 0x0003, 0x0002, gOamData_AffineOff_ObjNormal_16x16, gUnknown_082F42F4, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
||||
|
||||
.align 2
|
||||
gUnknown_082F4354:: @ 82F4354
|
||||
spr_template 0x0004, 0x0004, gOamData_AffineOff_ObjNormal_8x16, gUnknown_082F42FC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
||||
|
||||
.align 2
|
||||
gUnknown_082F436C:: @ 82F436C
|
||||
spr_template 0x0005, 0x0005, gOamData_AffineDouble_ObjNormal_32x32, gUnknown_082F4300, NULL, gUnknown_082F4304, SpriteCallbackDummy
|
||||
|
||||
.align 2
|
||||
gUnknown_082F4384:: @ 82F4384
|
||||
.byte 0x09, 0x02, 0x08, 0x00, 0x9c, 0x00, 0x00, 0x00
|
||||
.4byte gUnknown_082F420C
|
||||
.4byte gUnknown_082F422C
|
||||
|
||||
.byte 0x08, 0x02, 0x08, 0x00, 0xb4, 0x00, 0x00, 0x00
|
||||
.4byte gUnknown_082F420C
|
||||
.4byte gUnknown_082F422C
|
||||
|
||||
.byte 0x08, 0x02, 0x08, 0x00, 0xcc, 0x00, 0x00, 0x00
|
||||
.4byte gUnknown_082F420C
|
||||
.4byte gUnknown_082F422C
|
||||
|
||||
.align 2
|
||||
gUnknown_082F43B4:: @ 82F43B4
|
||||
.4byte gText_SpaceTimes2
|
||||
.4byte gText_XDotY
|
||||
.4byte gText_Var1Berry
|
||||
.4byte gText_NeatnessRankings
|
||||
.4byte gText_CoopRankings
|
||||
.4byte gText_PressingPowerRankings
|
||||
|
||||
.align 2
|
||||
gUnknown_082F43CC:: @ 82F43CC
|
||||
.4byte NULL
|
||||
.4byte sub_8022C58
|
||||
.4byte sub_8022CB0
|
||||
.4byte sub_8022D14
|
||||
.4byte sub_8022E1C
|
||||
.4byte sub_8022E3C
|
||||
.4byte sub_8022E5C
|
||||
.4byte sub_8022EAC
|
||||
.4byte sub_8022F04
|
||||
.4byte sub_8022F1C
|
||||
.4byte sub_8023070
|
||||
.4byte sub_80231B8
|
||||
.4byte sub_80232EC
|
||||
.4byte sub_80238F0
|
||||
.4byte sub_8023998
|
||||
.4byte sub_8023A30
|
||||
.4byte sub_8023BC0
|
||||
.4byte sub_8023CAC
|
||||
.4byte sub_8024048
|
||||
.4byte sub_8024134
|
||||
.4byte sub_8024228
|
||||
.4byte sub_80242E0
|
||||
.4byte sub_80243BC
|
||||
.4byte sub_8024444
|
||||
.4byte sub_8024508
|
||||
.4byte sub_8024568
|
||||
|
||||
.align 2
|
||||
gUnknown_082F4434:: @ 82F4434
|
||||
.byte 0x02, 0x04, 0x06, 0x07, 0x03, 0x05, 0x08, 0x0b
|
||||
.byte 0x03, 0x07, 0x0b, 0x0f, 0x04, 0x08, 0x0c, 0x11
|
||||
|
||||
gUnknown_082F4444:: @ 82F4444
|
||||
.byte 0x05, 0x07, 0x09, 0x0c
|
||||
|
||||
gUnknown_082F4448:: @ 82F4448
|
||||
.byte 0x03, 0x07, 0x0f, 0x1f
|
||||
@ -5006,6 +5006,7 @@ extern const u16 gUsePokeblockCondition_Pal[];
|
||||
// Berry Crush
|
||||
extern const u32 gUnknown_08DE34B8[];
|
||||
extern const u16 gUnknown_08DE3398[];
|
||||
extern const u32 gUnknown_08DE3FD4[];
|
||||
|
||||
// Pokenav
|
||||
extern const u32 gPokenavMessageBox_Gfx[];
|
||||
|
||||
@ -2882,6 +2882,21 @@ extern const u8 gText_CrushingResults[];
|
||||
extern const u8 gText_BerryCrush2[];
|
||||
extern const u8 gText_PressingSpeedRankings[];
|
||||
extern const u8 gText_Var1Players[];
|
||||
extern const u8 gText_ReadyToBerryCrush[];
|
||||
extern const u8 gText_WaitForAllChooseBerry[];
|
||||
extern const u8 gText_EndedWithXUnitsPowder[];
|
||||
extern const u8 gText_RecordingGameResults[];
|
||||
extern const u8 gText_PlayBerryCrushAgain[];
|
||||
extern const u8 gText_YouHaveNoBerries[];
|
||||
extern const u8 gText_MemberDroppedOut[];
|
||||
extern const u8 gText_TimesUpNoGoodPowder[];
|
||||
extern const u8 gText_CommunicationStandby2[];
|
||||
extern const u8 gText_SpaceTimes2[];
|
||||
extern const u8 gText_XDotY[];
|
||||
extern const u8 gText_Var1Berry[];
|
||||
extern const u8 gText_NeatnessRankings[];
|
||||
extern const u8 gText_CoopRankings[];
|
||||
extern const u8 gText_PressingPowerRankings[];
|
||||
|
||||
// Lilycove Lady
|
||||
extern const u8 gText_ContestLady_Handsome[];
|
||||
|
||||
@ -457,7 +457,6 @@ SECTIONS {
|
||||
src/mevent_scripts.o(.rodata);
|
||||
src/union_room_chat.o(.rodata);
|
||||
src/berry_crush.o(.rodata);
|
||||
data/berry_crush.o(.rodata);
|
||||
src/berry_powder.o(.rodata);
|
||||
src/dodrio_berry_picking.o(.rodata);
|
||||
src/pokemon_jump.o(.rodata);
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1576,8 +1576,7 @@ const u32 gUnknown_08DE3060[] = INCBIN_U32("graphics/frontier_pass/tiles.bin.lz"
|
||||
const u16 gUnknown_08DE3350[] = INCBIN_U16("graphics/frontier_pass/tilemap1.bin");
|
||||
const u16 gUnknown_08DE3374[] = INCBIN_U16("graphics/frontier_pass/tilemap2.bin");
|
||||
|
||||
// berry crusher
|
||||
|
||||
// Berry Crush
|
||||
const u16 gUnknown_08DE3398[] = INCBIN_U16("graphics/berry_crusher/tiles.gbapal");
|
||||
const u32 gUnknown_08DE34B8[] = INCBIN_U32("graphics/berry_crusher/tiles.4bpp.lz");
|
||||
const u32 gUnknown_08DE3FD4[] = INCBIN_U32("graphics/berry_crusher/tiles.bin.lz");
|
||||
|
||||
Loading…
Reference in New Issue
Block a user