ninjdai/pokeemerald
1
0
Fork 0
mirror of https://github.com/Ninjdai1/pokeemerald.git synced 2024-12-26 03:34:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

fixing conflicts

Browse Source
This commit is contained in:
golem galvanize 2018-01-20 19:44:34 -05:00
commit bdc8cf6ac4
13 changed files with 301 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

194
data/item_menu_icons.s
View File

@ -3,73 +3,219 @@
.include "constants/constants.inc" .include "constants/constants.inc"
.section .rodata .section .rodata
.align 2, 0
gUnknown_0857F464:: @ 857F464 .align 2
.incbin "baserom.gba", 0x57f464, 0xe0 gUnknown_0857F564:: @ 857F564
.incbin "graphics/interface/bag_spinner.gbapal"
gUnknown_0857F544:: @ 857F544 .align 2
.incbin "baserom.gba", 0x57f544, 0x5f0 gUnknown_0857F584:: @ 857F584
.incbin "graphics/interface/bag_spinner.4bpp"
.align 2
gUnknown_0857F604:: @ 857F604
.incbin "graphics/unused/cherry.4bpp"
.align 2
gUnknown_0857FA84:: @ 857FA84
.incbin "graphics/unused/cherry.gbapal"
.align 2
gOamData_857FAA4:: @ 857FAA4
.2byte 0x0100, 0xc000, 0x0400, 0x0000
.align 2
gSpriteAnim_857FAAC:: @ 857FAAC
.2byte 0x0000, 0x0004, 0xffff, 0x0000
.align 2
gSpriteAnim_857FAB4:: @ 857FAB4
.2byte 0x0040, 0x0004, 0xffff, 0x0000
.align 2
gSpriteAnim_857FABC:: @ 857FABC
.2byte 0x0080, 0x0004, 0xffff, 0x0000
.align 2
gSpriteAnim_857FAC4:: @ 857FAC4
.2byte 0x00c0, 0x0004, 0xffff, 0x0000
.align 2
gSpriteAnim_857FACC:: @ 857FACC
.2byte 0x0100, 0x0004, 0xffff, 0x0000
.align 2
gSpriteAnim_857FAD4:: @ 857FAD4
.2byte 0x0140, 0x0004, 0xffff, 0x0000
.align 2
gSpriteAnimTable_857FADC:: @ 857FADC
.4byte gSpriteAnim_857FAAC
.4byte gSpriteAnim_857FAB4
.4byte gSpriteAnim_857FAC4
.4byte gSpriteAnim_857FACC
.4byte gSpriteAnim_857FAD4
.4byte gSpriteAnim_857FABC
.align 2
gSpriteAffineAnim_857FAF4:: @ 857FAF4
.2byte 0x0100, 0x0100, 0x0000, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_857FB04:: @ 857FB04
.2byte 0x0000, 0x0000, 0x02fe, 0x0000, 0x0000, 0x0000, 0x0402, 0x0000, 0x0000, 0x0000, 0x04fe, 0x0000, 0x0000, 0x0000, 0x0202, 0x0000
.2byte 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnimTable_857FB2C:: @ 857FB2C
.4byte gSpriteAffineAnim_857FAF4
.4byte gSpriteAffineAnim_857FB04
.align 2
gUnknown_0857FB34:: @ 857FB34 gUnknown_0857FB34:: @ 857FB34
.incbin "baserom.gba", 0x57fb34, 0x8 obj_tiles gBagMaleTiles, 0x3000, 0x0064
.align 2
gUnknown_0857FB3C:: @ 857FB3C gUnknown_0857FB3C:: @ 857FB3C
.incbin "baserom.gba", 0x57fb3c, 0x8 obj_tiles gBagFemaleTiles, 0x3000, 0x0064
.align 2
gUnknown_0857FB44:: @ 857FB44 gUnknown_0857FB44:: @ 857FB44
.incbin "baserom.gba", 0x57fb44, 0x8 obj_pal gBagPalette, 0x0064
.align 2
gUnknown_0857FB4C:: @ 857FB4C gUnknown_0857FB4C:: @ 857FB4C
.incbin "baserom.gba", 0x57fb4c, 0x4c spr_template 0x0064, 0x0064, gOamData_857FAA4, gSpriteAnimTable_857FADC, NULL, gSpriteAffineAnimTable_857FB2C, SpriteCallbackDummy
.align 2
gOamData_857FB64:: @ 857FB64
.2byte 0x0000, 0x4800, 0x0800, 0x0000
.align 2
gSpriteAnim_857FB6C:: @ 857FB6C
.2byte 0x0000, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnimTable_857FB74:: @ 857FB74
.4byte gSpriteAnim_857FB6C
.align 2
gSpriteAffineAnim_857FB78:: @ 857FB78
.2byte 0x0000, 0x0000, 0x1008, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_857FB88:: @ 857FB88
.2byte 0x0000, 0x0000, 0x10f8, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_0857FB98:: @ 857FB98 gUnknown_0857FB98:: @ 857FB98
.incbin "baserom.gba", 0x57fb98, 0x4 .4byte gSpriteAffineAnim_857FB78
.align 2
gUnknown_0857FB9C:: @ 857FB9C gUnknown_0857FB9C:: @ 857FB9C
.incbin "baserom.gba", 0x57fb9c, 0x4 .4byte gSpriteAffineAnim_857FB88
.align 2
gUnknown_0857FBA0:: @ 857FBA0 gUnknown_0857FBA0:: @ 857FBA0
.incbin "baserom.gba", 0x57fba0, 0x8 obj_tiles gUnknown_0857F584, 0x0080, 0x0065
.align 2
gUnknown_0857FBA8:: @ 857FBA8 gUnknown_0857FBA8:: @ 857FBA8
.incbin "baserom.gba", 0x57fba8, 0x8 obj_pal gUnknown_0857F564, 0x0065
.align 2
gUnknown_0857FBB0:: @ 857FBB0 gUnknown_0857FBB0:: @ 857FBB0
.incbin "baserom.gba", 0x57fbb0, 0x3c spr_template 0x0065, 0x0065, gOamData_857FB64, gSpriteAnimTable_857FB74, NULL, gUnknown_0857FB98, ObjectCB_SwitchPocketRotatingBallInit
.align 2
gOamData_857FBC8:: @ 857FBC8
.2byte 0x0000, 0xc000, 0x7400, 0x0000
.align 2
gOamData_857FBD0:: @ 857FBD0
.2byte 0x0300, 0xc000, 0x7000, 0x0000
.align 2
gSpriteAnim_857FBD8:: @ 857FBD8
.2byte 0x0000, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnimTable_857FBE0:: @ 857FBE0
.4byte gSpriteAnim_857FBD8
.align 2
gOamData_857FBE4:: @ 857FBE4
.2byte 0xc000, 0x0201, 0x0800, 0x0000
.align 2
gUnknown_0857FBEC:: @ 857FBEC gUnknown_0857FBEC:: @ 857FBEC
.incbin "baserom.gba", 0x57fbec, 0x90 spr_template 0xffff, 0x7544, gOamData_857FBC8, gSpriteAnimTable_857FBE0, gOamData_857FBE4, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gSpriteAffineAnim_857FC04:: @ 857FC04
.2byte 0xffff, 0xffff, 0x60fd, 0x0000, 0x0000, 0x0000, 0x1000, 0x0000, 0xfffe, 0xfffe, 0x40ff, 0x0000, 0xfff8, 0x0000, 0x1000, 0x0000
.2byte 0x0000, 0xfff8, 0x1000, 0x0000, 0x0100, 0x0100, 0x0000, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_857FC3C:: @ 857FC3C
.2byte 0xffff, 0xffff, 0x6003, 0x0000, 0x0000, 0x0000, 0x1000, 0x0000, 0xfffe, 0xfffe, 0x4001, 0x0000, 0xfff8, 0x0000, 0x1000, 0x0000
.2byte 0x0000, 0xfff8, 0x1000, 0x0000, 0x0100, 0x0100, 0x0000, 0x0000, 0x7ffe, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnimTable_857FC74:: @ 857FC74
.4byte gSpriteAffineAnim_857FC04
.4byte gSpriteAffineAnim_857FC3C
.align 2
gUnknown_0857FC7C:: @ 857FC7C gUnknown_0857FC7C:: @ 857FC7C
.incbin "baserom.gba", 0x57fc7c, 0x18 spr_template 0xffff, 0x7544, gOamData_857FBD0, gSpriteAnimTable_857FBE0, gOamData_857FBE4, gSpriteAffineAnimTable_857FC74, SpriteCallbackDummy
@ 857FC94 @ 857FC94
.include "data/graphics/berries/berry_pic_table.inc" .include "data/graphics/berries/berry_pic_table.inc"
.align 2
gUnknown_0857FDEC:: @ 857FDEC gUnknown_0857FDEC:: @ 857FDEC
.incbin "baserom.gba", 0x57fdec, 0x8 obj_tiles gBerryCheckCircle_Gfx, 0x0800, 0x2710
.align 2
gUnknown_0857FDF4:: @ 857FDF4 gUnknown_0857FDF4:: @ 857FDF4
.incbin "baserom.gba", 0x57fdf4, 0x1c obj_pal gUnknown_08D9BEF0, 0x2710
.align 2
gOamData_857FDFC:: @ 857FDFC
.2byte 0x0000, 0xc000, 0x0400, 0x0000
.align 2
gSpriteAnim_857FE04:: @ 857FE04
.2byte 0x0000, 0x0000, 0xffff, 0x0000
.align 2
gSpriteAnimTable_857FE0C:: @ 857FE0C
.4byte gSpriteAnim_857FE04
.align 2
gUnknown_0857FE10:: @ 857FE10 gUnknown_0857FE10:: @ 857FE10
.incbin "baserom.gba", 0x57fe10, 0x18 spr_template 0x2710, 0x2710, gOamData_857FDFC, gSpriteAnimTable_857FE0C, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
.align 2
gUnknown_0857FE28:: @ 857FE28 gUnknown_0857FE28:: @ 857FE28
.incbin "baserom.gba", 0x57fe28, 0x18 spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D5860
.align 2
gUnknown_0857FE40:: @ 857FE40 gUnknown_0857FE40:: @ 857FE40
.incbin "baserom.gba", 0x57fe40, 0x18 spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D58F8
.align 2
gUnknown_0857FE58:: @ 857FE58 gUnknown_0857FE58:: @ 857FE58
.incbin "baserom.gba", 0x57fe58, 0x18 spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D5968
.align 2
gUnknown_0857FE70:: @ 857FE70 gUnknown_0857FE70:: @ 857FE70
.incbin "baserom.gba", 0x57fe70, 0x18 spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D5A94
.align 2
gUnknown_0857FE88:: @ 857FE88 gUnknown_0857FE88:: @ 857FE88
.incbin "baserom.gba", 0x57fe88, 0x18 spr_template 0x0000, 0x0000, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80D5B48
@ 857FEA0 @ 857FEA0
.include "data/text/item_descriptions.inc" .include "data/text/item_descriptions.inc"

10
data/map_name_popup.s
View File

@ -29,4 +29,14 @@ gMapPopUp_Palette_Table:: @ 857F384
.incbin "graphics/interface/map_popup/stone2.gbapal" .incbin "graphics/interface/map_popup/stone2.gbapal"
gUnknown_0857F444:: @ 857F444 gUnknown_0857F444:: @ 857F444
<<<<<<< HEAD
.incbin "graphics/interface/map_popup/857F444.gbapal" .incbin "graphics/interface/map_popup/857F444.gbapal"
=======
.incbin "baserom.gba", 0x57f444, 0x20
gUnknown_0857F464:: @ 857F464
.incbin "baserom.gba", 0x57f464, 0xe0
gUnknown_0857F544:: @ 857F544
.incbin "baserom.gba", 0x57f544, 0x20
>>>>>>> aca539d5dd97b55d149ca59c0561a721544d3298

130
data/starter_choose.s
View File

@ -4,68 +4,156 @@
.section .rodata .section .rodata
.align 2
gBirchBagGrassPal:: @ 85B0A00 gBirchBagGrassPal:: @ 85B0A00
.incbin "baserom.gba", 0x5b0a00, 0x80 .incbin "graphics/misc/birch_bag.gbapal"
.incbin "graphics/misc/birch_grass.gbapal"
.align 2
gBirchBallarrow_Pal:: @ 85B0A40
.incbin "graphics/misc/birch_ballarrow.gbapal"
.align 2
gBirchCircle_Pal:: @ 85B0A60
.incbin "graphics/misc/birch_circle.gbapal"
.align 2
gBirchBagTilemap:: @ 85B0A80 gBirchBagTilemap:: @ 85B0A80
.incbin "baserom.gba", 0x5b0a80, 0x18c .incbin "graphics/misc/birch_bag_map.bin.lz"
.align 2
gBirchGrassTilemap:: @ 85B0C0C gBirchGrassTilemap:: @ 85B0C0C
.incbin "baserom.gba", 0x5b0c0c, 0x1f8 .incbin "graphics/misc/birch_grass_map.bin.lz"
.align 2
gBirchHelpGfx:: @ 85B0E04 gBirchHelpGfx:: @ 85B0E04
.incbin "baserom.gba", 0x5b0e04, 0xaa8 .incbin "graphics/misc/birch_help.4bpp.lz"
.align 2
gUnknown_085B18AC:: @ 85B18AC gUnknown_085B18AC:: @ 85B18AC
.incbin "baserom.gba", 0x5b18AC, 0x520 .incbin "graphics/misc/birch_ballarrow.4bpp.lz"
.align 2
gUnknown_085B1BCC:: @ 85B1BCC
.incbin "graphics/misc/birch_circle.4bpp.lz"
.align 2
gUnknown_085B1DCC:: @ 85B1DCC gUnknown_085B1DCC:: @ 85B1DCC
.incbin "baserom.gba", 0x5b1dcc, 0x10 window_template 0x00, 0x03, 0x0f, 0x18, 0x04, 0x0e, 0x0200
null_window_template
.align 2
gUnknown_085B1DDC:: @ 85B1DDC gUnknown_085B1DDC:: @ 85B1DDC
.incbin "baserom.gba", 0x5b1ddc, 0x8 window_template 0x00, 0x18, 0x09, 0x05, 0x04, 0x0e, 0x0260
.align 2
gUnknown_085B1DE4:: @ 85B1DE4 gUnknown_085B1DE4:: @ 85B1DE4
.incbin "baserom.gba", 0x5b1de4, 0x8 window_template 0x00, 0x00, 0x00, 0x0d, 0x04, 0x0e, 0x0274
sPokeballCoords:: @ 85B1DEC sPokeballCoords:: @ 85B1DEC
.incbin "baserom.gba", 0x5b1dec, 0x6 .byte 0x3c, 0x40, 0x78, 0x58, 0xb4, 0x40
gStarterChoose_LabelCoords:: @ 85B1DF2 gStarterChoose_LabelCoords:: @ 85B1DF2
.incbin "baserom.gba", 0x5b1df2, 0x6 .byte 0x00, 0x09, 0x10, 0x0a, 0x08, 0x04
sStarterMon:: @ 85B1DF8 sStarterMon:: @ 85B1DF8
.2byte SPECIES_TREECKO .2byte SPECIES_TREECKO
.2byte SPECIES_TORCHIC .2byte SPECIES_TORCHIC
.2byte SPECIES_MUDKIP .2byte SPECIES_MUDKIP
.align 2 .align 2
gUnknown_085B1E00:: @ 85B1E00 gUnknown_085B1E00:: @ 85B1E00
.incbin "baserom.gba", 0x5b1e00, 0xc .4byte 0x000001f8, 0x00003072, 0x00001063
gUnknown_085B1E0C:: @ 85B1E0C gUnknown_085B1E0C:: @ 85B1E0C
.incbin "baserom.gba", 0x5b1e0c, 0x1c .byte 0x00, 0x01, 0x03
.align 2
gOamData_85B1E10:: @ 85B1E10
.2byte 0x00a0, 0x8000, 0x0400, 0x0000
.align 2
gOamData_85B1E18:: @ 85B1E18
.2byte 0x00a0, 0x8000, 0x0400, 0x0000
.align 2
gOamData_85B1E20:: @ 85B1E20
.2byte 0x03a0, 0xc000, 0x0400, 0x0000
gUnknown_085B1E28:: @ 85B1E28 gUnknown_085B1E28:: @ 85B1E28
.incbin "baserom.gba", 0x5b1e28, 0xa8 .byte 0x3c, 0x20, 0x78, 0x38, 0xb4, 0x20, 0x00, 0x00
.align 2
gSpriteAnim_85B1E30:: @ 85B1E30
.2byte 0x0030, 0x001e, 0xffff, 0x0000
.align 2
gSpriteAnim_85B1E38:: @ 85B1E38
.2byte 0x0000, 0x001e, 0xffff, 0x0000
.align 2
gSpriteAnim_85B1E40:: @ 85B1E40
.2byte 0x0010, 0x0004, 0x0000, 0x0004, 0x0020, 0x0004, 0x0000, 0x0004, 0x0010, 0x0004, 0x0000, 0x0004, 0x0020, 0x0004, 0x0000, 0x0004
.2byte 0x0000, 0x0020, 0x0010, 0x0008, 0x0000, 0x0008, 0x0020, 0x0008, 0x0000, 0x0008, 0x0010, 0x0008, 0x0000, 0x0008, 0x0020, 0x0008
.2byte 0x0000, 0x0008, 0xfffe, 0x0000
.align 2
gSpriteAnim_85B1E88:: @ 85B1E88
.2byte 0x0000, 0x0008, 0xffff, 0x0000
.align 2
gSpriteAnimTable_85B1E90:: @ 85B1E90
.4byte gSpriteAnim_85B1E30
.align 2
gSpriteAnimTable_85B1E94:: @ 85B1E94
.4byte gSpriteAnim_85B1E38
.4byte gSpriteAnim_85B1E40
.align 2
gSpriteAnimTable_85B1E9C:: @ 85B1E9C
.4byte gSpriteAnim_85B1E88
.align 2
gSpriteAffineAnim_85B1EA0:: @ 85B1EA0
.2byte 0x0010, 0x0010, 0x0000, 0x0000, 0x0010, 0x0010, 0x0f00, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gSpriteAffineAnim_85B1EB8:: @ 85B1EB8
.2byte 0x0014, 0x0014, 0x0000, 0x0000, 0x0014, 0x0014, 0x0f00, 0x0000, 0x7fff, 0x0000, 0x0000, 0x0000
.align 2
gUnknown_085B1ED0:: @ 85B1ED0 gUnknown_085B1ED0:: @ 85B1ED0
.incbin "baserom.gba", 0x5b1ed0, 0x8 .4byte gSpriteAffineAnim_85B1EA0
.align 2
gSpriteAffineAnimTable_85B1ED4:: @ 85B1ED4
.4byte gSpriteAffineAnim_85B1EB8
.align 2
gUnknown_085B1ED8:: @ 85B1ED8 gUnknown_085B1ED8:: @ 85B1ED8
.incbin "baserom.gba", 0x5b1ed8, 0x10 obj_tiles gUnknown_085B18AC, 0x0800, 0x1000
null_obj_tiles
.align 2
gUnknown_085B1EE8:: @ 85B1EE8 gUnknown_085B1EE8:: @ 85B1EE8
.incbin "baserom.gba", 0x5b1ee8, 0x10 obj_tiles gUnknown_085B1BCC, 0x0800, 0x1001
null_obj_tiles
.align 2
gUnknown_085B1EF8:: @ 85B1EF8 gUnknown_085B1EF8:: @ 85B1EF8
.incbin "baserom.gba", 0x5b1ef8, 0x18 obj_pal gBirchBallarrow_Pal, 0x1000
obj_pal gBirchCircle_Pal, 0x1001
null_obj_pal
.align 2
sSpriteTemplate_Hand:: @ 85B1F10 sSpriteTemplate_Hand:: @ 85B1F10
.incbin "baserom.gba", 0x5b1f10, 0x18 spr_template 0x1000, 0x1000, gOamData_85B1E10, gSpriteAnimTable_85B1E90, NULL, gDummySpriteAffineAnimTable, sub_81346DC
.align 2
sSpriteTemplate_PokeBall:: @ 85B1F28 sSpriteTemplate_PokeBall:: @ 85B1F28
.incbin "baserom.gba", 0x5b1f28, 0x18 spr_template 0x1000, 0x1000, gOamData_85B1E18, gSpriteAnimTable_85B1E94, NULL, gDummySpriteAffineAnimTable, sub_813473C
.align 2
gUnknown_085B1F40:: @ 85B1F40 gUnknown_085B1F40:: @ 85B1F40
.incbin "baserom.gba", 0x5b1f40, 0x18 spr_template 0x1001, 0x1001, gOamData_85B1E20, gSpriteAnimTable_85B1E9C, NULL, gSpriteAffineAnimTable_85B1ED4, StarterPokemonSpriteCallback

BIN
graphics/interface/bag_spinner.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 212 B

BIN
graphics/misc/birch_bag.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
graphics/misc/birch_bag_map.bin Normal file
View File

Binary file not shown.

BIN
graphics/misc/birch_ballarrow.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 635 B

BIN
graphics/misc/birch_circle.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 349 B

BIN
graphics/misc/birch_grass.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 691 B

BIN
graphics/misc/birch_grass_map.bin Normal file
View File

Binary file not shown.

BIN
graphics/unused/cherry.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 343 B

6
graphics_file_rules.mk
View File

@ -19,6 +19,7 @@ PKNAVGFXDIR := graphics/pokenav
PKNAVOPTIONSGFXDIR := graphics/pokenav/options PKNAVOPTIONSGFXDIR := graphics/pokenav/options
PSSGFXDIR := graphics/pokemon_storage PSSGFXDIR := graphics/pokemon_storage
MAPOBJGFXDIR := graphics/map_objects MAPOBJGFXDIR := graphics/map_objects
MISCGFXDIR := graphics/misc
types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark types := normal fight flying poison ground rock bug ghost steel mystery fire water grass electric psychic ice dragon dark
contest_types := cool beauty cute smart tough contest_types := cool beauty cute smart tough
@ -308,7 +309,7 @@ graphics/link_games/pkmnjump_bg.4bpp: %.4bpp: %.png
graphics/pokenav/region_map.8bpp: %.8bpp: %.png graphics/pokenav/region_map.8bpp: %.8bpp: %.png
$(GFX) $< $@ -num_tiles 233 $(GFX) $< $@ -num_tiles 233
graphics/misc/japanese_hof.4bpp: %.4bpp: %.png $(MISCGFXDIR)/japanese_hof.4bpp: %.4bpp: %.png
$(GFX) $< $@ -num_tiles 29 $(GFX) $< $@ -num_tiles 29
$(INTERFACEGFXDIR)/menu.gbapal: $(INTERFACEGFXDIR)/menu_0.gbapal \ $(INTERFACEGFXDIR)/menu.gbapal: $(INTERFACEGFXDIR)/menu_0.gbapal \
@ -665,3 +666,6 @@ $(INTERFACEGFXDIR)/region_map.8bpp: %.8bpp: %.png
$(INTERFACEGFXDIR)/region_map_affine.8bpp: %.8bpp: %.png $(INTERFACEGFXDIR)/region_map_affine.8bpp: %.8bpp: %.png
$(GFX) $< $@ -num_tiles 233 $(GFX) $< $@ -num_tiles 233
$(MISCGFXDIR)/birch_help.4bpp: $(MISCGFXDIR)/birch_bag.4bpp $(MISCGFXDIR)/birch_grass.4bpp
@cat $^ >$@

8
src/starter_choose.c
View File

@ -74,7 +74,7 @@ static void Task_MoveStarterChooseCursor(u8 taskId);
static void sub_8134668(u8 taskId); static void sub_8134668(u8 taskId);
static void CreateStarterPokemonLabel(u8 selection); static void CreateStarterPokemonLabel(u8 selection);
static u8 CreatePokemonFrontSprite(u16 species, u8 x, u8 y); static u8 CreatePokemonFrontSprite(u16 species, u8 x, u8 y);
static void StarterPokemonSpriteCallback(struct Sprite *sprite); void StarterPokemonSpriteCallback(struct Sprite *sprite);
static IWRAM_DATA u16 sStarterChooseWindowId; static IWRAM_DATA u16 sStarterChooseWindowId;
@ -361,7 +361,7 @@ static u8 CreatePokemonFrontSprite(u16 species, u8 x, u8 y)
return spriteId; return spriteId;
} }
static void sub_81346DC(struct Sprite *sprite) void sub_81346DC(struct Sprite *sprite)
{ {
sprite->pos1.x = gUnknown_085B1E28[gTasks[sprite->data[0]].tStarterSelection][0]; sprite->pos1.x = gUnknown_085B1E28[gTasks[sprite->data[0]].tStarterSelection][0];
sprite->pos1.y = gUnknown_085B1E28[gTasks[sprite->data[0]].tStarterSelection][1]; sprite->pos1.y = gUnknown_085B1E28[gTasks[sprite->data[0]].tStarterSelection][1];
@ -369,7 +369,7 @@ static void sub_81346DC(struct Sprite *sprite)
sprite->data[1] = (u8)(sprite->data[1]) + 4; sprite->data[1] = (u8)(sprite->data[1]) + 4;
} }
static void sub_813473C(struct Sprite *sprite) void sub_813473C(struct Sprite *sprite)
{ {
if (gTasks[sprite->data[0]].tStarterSelection == sprite->data[1]) if (gTasks[sprite->data[0]].tStarterSelection == sprite->data[1])
StartSpriteAnimIfDifferent(sprite, 1); StartSpriteAnimIfDifferent(sprite, 1);
@ -377,7 +377,7 @@ static void sub_813473C(struct Sprite *sprite)
StartSpriteAnimIfDifferent(sprite, 0); StartSpriteAnimIfDifferent(sprite, 0);
} }
static void StarterPokemonSpriteCallback(struct Sprite *sprite) void StarterPokemonSpriteCallback(struct Sprite *sprite)
{ {
//Move sprite to upper center of screen //Move sprite to upper center of screen
if (sprite->pos1.x > STARTER_PKMN_POS_X) if (sprite->pos1.x > STARTER_PKMN_POS_X)