mirror of
https://github.com/Ninjdai1/pokeemerald.git
synced 2024-12-26 03:34:15 +01:00
MORE DODRIO BERRY PICKINGgit status!
This commit is contained in:
DizzyEggg
parent
ba1a70419a
commit
02cadbee60
File diff suppressed because it is too large
Load Diff
@ -5,564 +5,6 @@
|
||||
|
||||
|
||||
|
||||
|
||||
.align 2
|
||||
gUnknown_082F7DF0_UnrefDupe:: @ 82F4698
|
||||
.incbin "graphics/link_games/dodrioberry_bg1.gbapal"
|
||||
|
||||
.align 2
|
||||
.incbin "graphics/link_games/dodrioberry_bg2.gbapal"
|
||||
|
||||
.align 2
|
||||
gUnknown_082F7E30_UnrefDupe:: @ 82F46B8
|
||||
.incbin "graphics/link_games/dodrioberry_pkmn.gbapal"
|
||||
|
||||
.align 2
|
||||
gUnknown_082F7E50_UnrefDupe:: @ 82F46D8
|
||||
.incbin "graphics/link_games/dodrioberry_shiny.gbapal"
|
||||
|
||||
.align 2
|
||||
gUnknown_082F7E70_UnrefDupe:: @ 82F46F8
|
||||
.incbin "graphics/link_games/dodrioberry_status.gbapal"
|
||||
|
||||
.align 2
|
||||
gUnknown_082F7E90_UnrefDupe:: @ 82F4718
|
||||
.incbin "graphics/link_games/dodrioberry_berrysprites.gbapal"
|
||||
|
||||
.align 2
|
||||
gUnknown_082F7EB0_UnrefDupe:: @ 82F4738
|
||||
.incbin "graphics/link_games/dodrioberry_berrysprites.4bpp.lz"
|
||||
|
||||
.align 2
|
||||
gUnknown_082F8064_UnrefDupe:: @ 82F490C
|
||||
.incbin "graphics/link_games/dodrioberry_platform.gbapal"
|
||||
|
||||
.align 2
|
||||
gUnknown_082F8084_UnrefDupe:: @ 82F492C
|
||||
.incbin "graphics/link_games/dodrioberry_bg1.4bpp.lz"
|
||||
|
||||
.align 2
|
||||
gUnknown_082F8914_UnrefDupe:: @ 82F51BC
|
||||
.incbin "graphics/link_games/dodrioberry_bg2.4bpp.lz"
|
||||
|
||||
.align 2
|
||||
gUnknown_082F96E0_UnrefDupe:: @ 82F5F88
|
||||
.incbin "graphics/link_games/dodrioberry_status.4bpp.lz"
|
||||
|
||||
.align 2
|
||||
gUnknown_082F9774_UnrefDupe:: @ 82F601C
|
||||
.incbin "graphics/link_games/dodrioberry_platform.4bpp.lz"
|
||||
|
||||
.align 2
|
||||
gUnknown_082F98BC_UnrefDupe:: @ 82F6164
|
||||
.incbin "graphics/link_games/dodrioberry_pkmn.4bpp.lz"
|
||||
|
||||
.align 2
|
||||
gUnknown_082FAAD8_UnrefDupe:: @ 82F7380
|
||||
.incbin "graphics/link_games/dodrioberry_bg1.bin.lz"
|
||||
|
||||
.align 2
|
||||
gUnknown_082FAD44_UnrefDupe:: @ 82F75EC
|
||||
.incbin "graphics/link_games/dodrioberry_bg2right.bin.lz"
|
||||
|
||||
.align 2
|
||||
gUnknown_082FAF94_UnrefDupe:: @ 82F783C
|
||||
.incbin "graphics/link_games/dodrioberry_bg2left.bin.lz"
|
||||
|
||||
.align 2
|
||||
gUnknown_082F7A88:: @ 82F7A88
|
||||
.byte 0x28, 0x18, 0x0d, 0x20, 0x13, 0x0a, 0x16, 0x0d
|
||||
.byte 0x07, 0x00, 0x00, 0x00
|
||||
|
||||
.align 2
|
||||
gUnknown_082F7A94:: @ 82F7A94
|
||||
.byte 0x08, 0x05, 0x08, 0x0b, 0x0f, 0x00, 0x00, 0x00
|
||||
|
||||
.align 2
|
||||
gUnknown_082F7A9C:: @ 82F7A9C
|
||||
.byte 0x05, 0x0a, 0x14, 0x1e, 0x32, 0x46, 0x64, 0x00
|
||||
|
||||
.align 2
|
||||
gUnknown_082F7AA4:: @ 82F7AA4
|
||||
.byte 0x0f, 0x10, 0x11, 0x12, 0x13, 0x13, 0x12, 0x11
|
||||
.byte 0x10, 0x0f, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19
|
||||
.byte 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20, 0x21
|
||||
.byte 0x22, 0x22, 0x21, 0x20, 0x1f, 0x1e, 0x00, 0x00
|
||||
|
||||
.align 2
|
||||
gUnknown_082F7AC4:: @ 82F7AC4
|
||||
.4byte sub_8024DBC
|
||||
.4byte sub_8024E00
|
||||
.4byte sub_8024E38
|
||||
.4byte sub_8024F10
|
||||
.4byte sub_8024F38
|
||||
.4byte sub_8025198
|
||||
.4byte sub_8025324
|
||||
.4byte sub_8025470
|
||||
.4byte sub_8025644
|
||||
.4byte sub_80256AC
|
||||
.4byte sub_8025758
|
||||
.4byte sub_80250D4
|
||||
|
||||
.align 2
|
||||
gUnknown_082F7AF4:: @ 82F7AF4
|
||||
.4byte sub_8024DBC
|
||||
.4byte sub_8024E00
|
||||
.4byte sub_8024E38
|
||||
.4byte sub_8024F10
|
||||
.4byte sub_8024FFC
|
||||
.4byte sub_8025230
|
||||
.4byte sub_8025324
|
||||
.4byte sub_8025470
|
||||
.4byte sub_8025644
|
||||
.4byte sub_80256AC
|
||||
.4byte sub_8025758
|
||||
.4byte sub_8025158
|
||||
|
||||
.align 2
|
||||
gUnknown_082F7B24:: @ 82F7B24
|
||||
.2byte 0x000a, 0x001e, 0x0032, 0x0032
|
||||
|
||||
.align 2
|
||||
gUnknown_082F7B2C:: @ 82F7B2C
|
||||
.byte 0x00, 0x05, 0x01, 0x14, 0x0b, 0x0f, 0x01, 0x00
|
||||
|
||||
.align 2
|
||||
gUnknown_082F7B34:: @ 82F7B34
|
||||
.4byte gText_BerriesPicked
|
||||
.4byte gText_BestScore
|
||||
.4byte gText_BerriesInRowFivePlayers
|
||||
|
||||
.align 2
|
||||
gUnknown_082F7B40:: @ 82F7B40
|
||||
.byte 0x04, 0x07, 0x04, 0x00
|
||||
|
||||
.align 2
|
||||
gUnknown_082F7B44:: @ 82F7B44
|
||||
.2byte 0x0019, 0x0029, 0x0039
|
||||
|
||||
gUnknown_082F7B4A:: @ 82F7B4A
|
||||
.2byte 0x0019, 0x0029, 0x0049
|
||||
|
||||
.align 2
|
||||
gUnknown_082F7B50:: @ 82F7B50
|
||||
.2byte 0x270f, 0x0000, 0x005a, 0x270f, 0x270f, 0x270f, 0x0046, 0x270f
|
||||
.2byte 0x270f, 0x0000, 0x270f, 0x0000, 0x270f, 0x270f, 0x003c, 0x0000
|
||||
.2byte 0x270f, 0x270f, 0x270f, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_082F7B78:: @ 82F7B78
|
||||
.string "あいうえおかき$"
|
||||
|
||||
.align 2
|
||||
gUnknown_082F7B80:: @ 82F7B80
|
||||
.string "ABCDEFG$"
|
||||
|
||||
.align 2
|
||||
gUnknown_082F7B88:: @ 82F7B88
|
||||
.string "0123456$"
|
||||
|
||||
.align 2
|
||||
gUnknown_082F7B90:: @ 82F7B90
|
||||
.4byte gUnknown_082F7B78
|
||||
.4byte gUnknown_082F7B78
|
||||
.4byte gUnknown_082F7B78
|
||||
.4byte gUnknown_082F7B80
|
||||
.4byte gUnknown_082F7B88
|
||||
|
||||
.align 2
|
||||
gUnknown_082F7BA4:: @ 82F7BA4 struct BgTemplate
|
||||
.4byte 0x000001e0
|
||||
.4byte 0x000012c9
|
||||
.4byte 0x000012ea
|
||||
.4byte 0x000021ff
|
||||
.4byte 0x000000ff
|
||||
.4byte 0x00000000
|
||||
|
||||
.align 2
|
||||
gUnknown_082F7BBC:: @ 82F7BBC
|
||||
window_template 0x00, 0x01, 0x01, 0x1c, 0x02, 0x0d, 0x0013
|
||||
window_template 0x00, 0x01, 0x05, 0x1c, 0x0e, 0x0d, 0x004b
|
||||
|
||||
.align 2
|
||||
gUnknown_082F7BCC:: @ 82F7BCC
|
||||
window_template 0x00, 0x01, 0x05, 0x1c, 0x07, 0x0d, 0x004b
|
||||
|
||||
.align 2
|
||||
gUnknown_082F7BD4:: @ 82F7BD4
|
||||
window_template 0x00, 0x01, 0x08, 0x13, 0x03, 0x0d, 0x0013
|
||||
window_template 0x00, 0x16, 0x07, 0x06, 0x04, 0x0d, 0x004c
|
||||
|
||||
.align 2
|
||||
gUnknown_082F7BE4:: @ 82F7BE4
|
||||
window_template 0x00, 0x04, 0x06, 0x16, 0x05, 0x0d, 0x0013
|
||||
|
||||
.align 2
|
||||
gUnknown_082F7BEC:: @ 82F7BEC
|
||||
window_template 0x00, 0x05, 0x08, 0x13, 0x03, 0x0d, 0x0013
|
||||
|
||||
.align 2
|
||||
gUnknown_082F449C_UnrefDupe:: @ 82F7BF4
|
||||
.byte 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07
|
||||
.byte 0x08, 0x09, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x03, 0x08
|
||||
.byte 0x09, 0x00, 0x00, 0x01, 0x02, 0x05, 0x06, 0x03
|
||||
.byte 0x04, 0x05, 0x08, 0x09, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01
|
||||
.byte 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x02, 0x09
|
||||
.byte 0x00, 0x00, 0x01, 0x04, 0x05, 0x06, 0x07, 0x02
|
||||
.byte 0x03, 0x04, 0x09, 0x00, 0x00, 0x01, 0x06, 0x07
|
||||
.byte 0x02, 0x03, 0x04, 0x05, 0x06, 0x09, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02
|
||||
.byte 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x01, 0x00
|
||||
.byte 0x00, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x01
|
||||
.byte 0x02, 0x03, 0x00, 0x00, 0x05, 0x06, 0x07, 0x08
|
||||
.byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x00, 0x00, 0x07
|
||||
.byte 0x08, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x03
|
||||
.byte 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x00, 0x02
|
||||
.byte 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x00
|
||||
.byte 0x01, 0x02, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09
|
||||
.byte 0x00, 0x01, 0x02, 0x03, 0x04, 0x06, 0x07, 0x08
|
||||
.byte 0x09, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06
|
||||
.byte 0x08, 0x09, 0x00, 0x01, 0x02, 0x03, 0x04, 0x05
|
||||
.byte 0x06, 0x07, 0x08, 0x04, 0x05, 0x06, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x03, 0x04, 0x05, 0x05, 0x06, 0x03
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x04, 0x05, 0x06, 0x06, 0x07, 0x02, 0x02
|
||||
.byte 0x03, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x03, 0x04, 0x05, 0x05, 0x06, 0x07, 0x07, 0x08
|
||||
.byte 0x01, 0x01, 0x02, 0x03, 0x00, 0x00, 0x00, 0x04
|
||||
.byte 0x05, 0x06, 0x06, 0x07, 0x08, 0x08, 0x09, 0x00
|
||||
.byte 0x00, 0x01, 0x02, 0x02, 0x03, 0x04, 0x01, 0x00
|
||||
.byte 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x01
|
||||
.byte 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x01, 0x00
|
||||
.byte 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x00, 0x03, 0x00, 0x01, 0x00, 0x01
|
||||
.byte 0x02, 0x01, 0x02, 0x03, 0x02, 0x03, 0x00, 0x00
|
||||
.byte 0x00, 0x00, 0x04, 0x00, 0x01, 0x00, 0x01, 0x02
|
||||
.byte 0x01, 0x02, 0x03, 0x02, 0x03, 0x04, 0x03, 0x04
|
||||
.byte 0x00, 0x00, 0x00, 0x00, 0x09, 0x09, 0x09, 0x09
|
||||
.byte 0x01, 0x01, 0x01, 0x09, 0x09, 0x09, 0x09, 0x09
|
||||
.byte 0x09, 0x09, 0x00, 0x00, 0x01, 0x01, 0x00, 0x09
|
||||
.byte 0x09, 0x09, 0x09, 0x09, 0x02, 0x02, 0x00, 0x00
|
||||
.byte 0x01, 0x01, 0x01, 0x09, 0x09, 0x09, 0x03, 0x03
|
||||
.byte 0x00, 0x00, 0x01, 0x01, 0x02, 0x02, 0x03, 0x09
|
||||
.byte 0x03, 0x03, 0x04, 0x04, 0x00, 0x00, 0x01, 0x01
|
||||
.byte 0x02, 0x02, 0x03, 0x05, 0x00, 0x00, 0x00, 0x00
|
||||
.byte 0x04, 0x06, 0x00, 0x00, 0x00, 0x03, 0x05, 0x07
|
||||
.byte 0x00, 0x00, 0x02, 0x04, 0x06, 0x08, 0x00, 0x01
|
||||
.byte 0x03, 0x05, 0x06, 0x09
|
||||
|
||||
.align 2
|
||||
gDodrioBerryBgPal1:: @ 82F7DF0
|
||||
.incbin "graphics/link_games/dodrioberry_bg1.gbapal"
|
||||
|
||||
.align 2
|
||||
.incbin "graphics/link_games/dodrioberry_bg2.gbapal"
|
||||
|
||||
.align 2
|
||||
gDodrioBerryPkmnPal:: @ 82F7E30
|
||||
.incbin "graphics/link_games/dodrioberry_pkmn.gbapal"
|
||||
|
||||
.align 2
|
||||
gDodrioBerryShinyPal:: @ 82F7E50
|
||||
.incbin "graphics/link_games/dodrioberry_shiny.gbapal"
|
||||
|
||||
.align 2
|
||||
gDodrioBerryStatusPal:: @ 82F7E70
|
||||
.incbin "graphics/link_games/dodrioberry_status.gbapal"
|
||||
|
||||
.align 2
|
||||
gDodrioBerrySpritesPal:: @ 82F7E90
|
||||
.incbin "graphics/link_games/dodrioberry_berrysprites.gbapal"
|
||||
|
||||
.align 2
|
||||
gDodrioBerrySpritesGfx:: @ 82F7EB0
|
||||
.incbin "graphics/link_games/dodrioberry_berrysprites.4bpp.lz"
|
||||
|
||||
.align 2
|
||||
gDodrioBerryPlatformPal:: @ 82F8064
|
||||
.incbin "graphics/link_games/dodrioberry_platform.gbapal"
|
||||
|
||||
.align 2
|
||||
gDodrioBerryBgGfx1:: @ 82F8084
|
||||
.incbin "graphics/link_games/dodrioberry_bg1.4bpp.lz"
|
||||
|
||||
.align 2
|
||||
gDodrioBerryBgGfx2:: @ 82F8914
|
||||
.incbin "graphics/link_games/dodrioberry_bg2.4bpp.lz"
|
||||
|
||||
.align 2
|
||||
gDodrioBerryStatusGfx:: @ 82F96E0
|
||||
.incbin "graphics/link_games/dodrioberry_status.4bpp.lz"
|
||||
|
||||
.align 2
|
||||
gDodrioBerryPlatformGfx:: @ 82F9774
|
||||
.incbin "graphics/link_games/dodrioberry_platform.4bpp.lz"
|
||||
|
||||
.align 2
|
||||
gDodrioBerryPkmnGfx:: @ 82F98BC
|
||||
.incbin "graphics/link_games/dodrioberry_pkmn.4bpp.lz"
|
||||
|
||||
.align 2
|
||||
gDodrioBerryBgTilemap1:: @ 82FAAD8
|
||||
.incbin "graphics/link_games/dodrioberry_bg1.bin.lz"
|
||||
|
||||
.align 2
|
||||
gDodrioBerryBgTilemap2Right:: @ 82FAD44
|
||||
.incbin "graphics/link_games/dodrioberry_bg2right.bin.lz"
|
||||
|
||||
.align 2
|
||||
gDodrioBerryBgTilemap2Left:: @ 82FAF94
|
||||
.incbin "graphics/link_games/dodrioberry_bg2left.bin.lz"
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB1E0:: @ 82FB1E0
|
||||
.byte 0x00, 0x00, 0x00, 0xc0, 0x00, 0x08, 0x00, 0x00
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB1E8:: @ 82FB1E8
|
||||
.byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x00, 0x00, 0x00
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB1F0:: @ 82FB1F0
|
||||
.byte 0x00, 0x00, 0x00, 0x40, 0x00, 0x08, 0x00, 0x00
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB1F8:: @ 82FB1F8
|
||||
.byte 0x00, 0x40, 0x00, 0xc0, 0x00, 0x0c, 0x00, 0x00
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB200:: @ 82FB200
|
||||
.2byte 0x0000, 0x0014
|
||||
.2byte 0xfffe, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB208:: @ 82FB208
|
||||
.2byte 0x0040, 0x0014
|
||||
.2byte 0xfffe, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB210:: @ 82FB210
|
||||
.2byte 0x0080, 0x0014
|
||||
.2byte 0xfffe, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB218:: @ 82FB218
|
||||
.2byte 0x00c0, 0x0014
|
||||
.2byte 0xfffe, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB220:: @ 82FB220
|
||||
.2byte 0x0100, 0x0014
|
||||
.2byte 0xfffe, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB228:: @ 82FB228
|
||||
.4byte gUnknown_082FB200
|
||||
.4byte gUnknown_082FB208
|
||||
.4byte gUnknown_082FB210
|
||||
.4byte gUnknown_082FB218
|
||||
.4byte gUnknown_082FB220
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB23C:: @ 82FB23C
|
||||
.2byte 0x0000, 0x0014
|
||||
.2byte 0xfffe, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB244:: @ 82FB244
|
||||
.2byte 0x0004, 0x0014
|
||||
.2byte 0xfffe, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB24C:: @ 82FB24C
|
||||
.2byte 0x0008, 0x0014
|
||||
.2byte 0xfffe, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB254:: @ 82FB254
|
||||
.4byte gUnknown_082FB23C
|
||||
.4byte gUnknown_082FB244
|
||||
.4byte gUnknown_082FB24C
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB260:: @ 82FB260
|
||||
.2byte 0x0000, 0x0014
|
||||
.2byte 0xfffe, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB268:: @ 82FB268
|
||||
.2byte 0x0004, 0x0014
|
||||
.2byte 0xfffe, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB270:: @ 82FB270
|
||||
.2byte 0x0008, 0x0014
|
||||
.2byte 0xfffe, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB278:: @ 82FB278
|
||||
.2byte 0x000c, 0x0014
|
||||
.2byte 0xfffe, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB280:: @ 82FB280
|
||||
.2byte 0x0010, 0x0014
|
||||
.2byte 0xfffe, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB288:: @ 82FB288
|
||||
.2byte 0x0014, 0x0014
|
||||
.2byte 0xfffe, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB290:: @ 82FB290
|
||||
.2byte 0x0018, 0x0014
|
||||
.2byte 0xfffe, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB298:: @ 82FB298
|
||||
.2byte 0x001c, 0x0014
|
||||
.2byte 0xfffe, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB2A0:: @ 82FB2A0
|
||||
.2byte 0x0020, 0x0014
|
||||
.2byte 0xfffe, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB2A8:: @ 82FB2A8
|
||||
.4byte gUnknown_082FB260
|
||||
.4byte gUnknown_082FB268
|
||||
.4byte gUnknown_082FB270
|
||||
.4byte gUnknown_082FB278
|
||||
.4byte gUnknown_082FB280
|
||||
.4byte gUnknown_082FB288
|
||||
.4byte gUnknown_082FB290
|
||||
.4byte gUnknown_082FB298
|
||||
.4byte gUnknown_082FB2A0
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB2CC:: @ 82FB2CC
|
||||
.2byte 0x0000, 0x0014
|
||||
.2byte 0xfffe, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB2D4:: @ 82FB2D4
|
||||
.4byte gUnknown_082FB2CC
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB2D8:: @ 82FB2D8
|
||||
obj_pal gDodrioBerryPkmnPal, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB2E0:: @ 82FB2E0
|
||||
obj_pal gDodrioBerryShinyPal, 0x0001
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB2E8:: @ 82FB2E8
|
||||
obj_pal gDodrioBerryStatusPal, 0x0002
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB2F0:: @ 82FB2F0
|
||||
spr_template 0x0001, 0x0002, gUnknown_082FB1E8, gUnknown_082FB254, NULL, gDummySpriteAffineAnimTable, nullsub_15
|
||||
|
||||
.align 2
|
||||
.byte 0xD4, 0x3E, 0x3F, 0x40, 0x41, 0x42, 0x43, 0x44
|
||||
.byte 0x45, 0xFB, 0x00, 0x00
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB314:: @ 82FB314
|
||||
obj_pal gDodrioBerrySpritesPal, 0x0003
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB31C:: @ 82FB31C
|
||||
.2byte 0x0058, 0x0080, 0x00a8, 0x00d0
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB324:: @ 82FB324
|
||||
spr_template 0x0002, 0x0003, gUnknown_082FB1F0, gUnknown_082FB2A8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB33C:: @ 82FB33C
|
||||
spr_template 0x0002, 0x0003, gUnknown_082FB1E8, gUnknown_082FB2A8, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB354:: @ 82FB354
|
||||
.byte 0x1E, 0x14
|
||||
|
||||
gUnknown_082FB356:: @ 82FB356
|
||||
.byte 0xE6, 0x00
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB358:: @ 82FB358
|
||||
.2byte 0x0037, 0x001e, 0x004a, 0x0000
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB360:: @ 82FB360
|
||||
obj_pal gDodrioBerryPlatformPal, 0x0006
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB368:: @ 82FB368
|
||||
spr_template 0x0005, 0x0006, gUnknown_082FB1F8, gUnknown_082FB2D4, NULL, gDummySpriteAffineAnimTable, sub_8028CF4
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB380:: @ 82FB380
|
||||
.byte 0x01, 0x02, 0x03
|
||||
|
||||
gUnknown_082FB383:: @ 82FB383
|
||||
.byte 0x01, 0x04, 0x05
|
||||
.byte 0x01, 0x08, 0x09
|
||||
.byte 0x01, 0x06, 0x07
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB38C:: @ 82FB38C
|
||||
.byte 0x0c, 0x06, 0x00, 0x00
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB390:: @ 82FB390
|
||||
.byte 0x09, 0x0a, 0x00, 0x00, 0x0f, 0x06, 0x00, 0x00
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB398:: @ 82FB398
|
||||
.byte 0x0c, 0x06, 0x00, 0x00, 0x12, 0x0a, 0x00, 0x00
|
||||
.byte 0x06, 0x0a, 0x00, 0x00
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB3A4:: @ 82FB3A4
|
||||
.byte 0x09, 0x0a, 0x00, 0x00, 0x0f, 0x06, 0x00, 0x00
|
||||
.byte 0x15, 0x0a, 0x00, 0x00, 0x03, 0x06, 0x00, 0x00
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB3B4:: @ 82FB3B4
|
||||
.byte 0x0c, 0x06, 0x00, 0x00, 0x12, 0x0a, 0x00, 0x00
|
||||
.byte 0x17, 0x06, 0x00, 0x00, 0x01, 0x06, 0x00, 0x00
|
||||
.byte 0x06, 0x0a, 0x00, 0x00
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB3C8:: @ 82FB3C8
|
||||
.4byte gUnknown_082FB38C
|
||||
.4byte gUnknown_082FB390
|
||||
.4byte gUnknown_082FB398
|
||||
.4byte gUnknown_082FB3A4
|
||||
.4byte gUnknown_082FB3B4
|
||||
|
||||
.align 2
|
||||
gUnknown_082FB3DC:: @ 82FB3DC
|
||||
.4byte gText_1Colon
|
||||
|
||||
@ -275,7 +275,7 @@ void sub_8010FCC(u32 a0, u32 a1, u32 a2);
|
||||
void sub_8011C84(void);
|
||||
void sub_8012188(const u8 *name, struct UnkLinkRfuStruct_02022B14 *structPtr, u8 a2);
|
||||
bool32 sub_8011B90(void);
|
||||
void sub_800FE50(u16 *a0);
|
||||
void sub_800FE50(void *a0);
|
||||
bool32 sub_800E540(u16 id, u8 *name);
|
||||
void sub_8011DE0(u32 arg0);
|
||||
u8 sub_801100C(s32 a0);
|
||||
|
||||
@ -2723,4 +2723,10 @@ extern const u8 gText_NumberOfBattles[];
|
||||
extern const u8 gText_Unknown[];
|
||||
extern const u8 gText_TrainerCloseBy[];
|
||||
|
||||
// Dodrio Berry Picking
|
||||
extern const u8 gText_BerryPickingRecords[];
|
||||
extern const u8 gText_BerriesPicked[];
|
||||
extern const u8 gText_BerriesInRowFivePlayers[];
|
||||
extern const u8 gText_BestScore[];
|
||||
|
||||
#endif // GUARD_STRINGS_H
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -2415,7 +2415,7 @@ void RecordMixTrainerNames(void)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Save the connected trainers first, at the top of the list.
|
||||
nextSpace = 0;
|
||||
for (i = 0; i < GetLinkPlayerCount(); i++)
|
||||
@ -2446,7 +2446,7 @@ void RecordMixTrainerNames(void)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Finalize the new list, and clean up.
|
||||
memcpy(gSaveBlock1Ptr->trainerNameRecords, newRecords, 20 * sizeof(struct TrainerNameRecord));
|
||||
free(newRecords);
|
||||
@ -3495,7 +3495,7 @@ void sub_800FD14(u16 command)
|
||||
}
|
||||
}
|
||||
|
||||
void sub_800FE50(u16 *a0)
|
||||
void sub_800FE50(void *a0)
|
||||
{
|
||||
if (gSendCmd[0] == 0 && !sub_8011A80())
|
||||
{
|
||||
|
||||
Loading…
Reference in New Issue
Block a user