diff --git a/data/graphics/board_pickups.inc b/data/graphics/board_pickups.inc new file mode 100644 index 0000000..e69de29 diff --git a/data/rom_1.s b/data/rom_1.s index 950c6b5..ce6b7a9 100644 --- a/data/rom_1.s +++ b/data/rom_1.s @@ -1710,7 +1710,26 @@ gUnknown_083C806C:: @ 0x083C806C .include "data/graphics/mon_hatch_sprites.inc" -.incbin "baserom.gba", 0x3EB84C, 0x12C00 @ 0x3FE44C - 0x3EB84C +gUnknown_083EB84C:: @ 0x083EB84C + .incbin "graphics/board_pickups/icon1.4bpp" +gUnknown_083ED64C:: @ 0x083ED64C + .incbin "graphics/board_pickups/icon2.4bpp" +gUnknown_083EF44C:: @ 0x083EF44C + .incbin "graphics/board_pickups/icon3.4bpp" +gUnknown_083F124C:: @ 0x083F124C + .incbin "graphics/board_pickups/icon9.4bpp" +gUnknown_083F304C:: @ 0x083F304C + .incbin "graphics/board_pickups/icon4.4bpp" +gUnknown_083F4E4C:: @ 0x083F4E4C + .incbin "graphics/board_pickups/icon5.4bpp" +gUnknown_083F6C4C:: @ 0x083F6C4C + .incbin "graphics/board_pickups/icon6.4bpp" +gUnknown_083F8A4C:: @ 0x083F8A4C + .incbin "graphics/board_pickups/icon10.4bpp" +gUnknown_083FA84C:: @ 0x083FA84C + .incbin "graphics/board_pickups/icon8.4bpp" +gUnknown_083FC64C:: @ 0x083FC64C + .incbin "graphics/board_pickups/icon7.4bpp" gUnknown_083FE44C:: @ 0x083FE44C .incbin "baserom.gba", 0x3FE44C, 0xC00 @@ -1923,7 +1942,7 @@ gUnknown_084FB68C:: @ 0x084FB68C .incbin "graphics/stage/ruby/hatch_cave.4bpp"; gUnknown_084FD18C:: @ 0x084FD18C - .incbin "baserom.gba", 0x4FD18C, 0xE00 + .incbin "graphics/stage/main/egg.4bpp"; gUnknown_084FDF8C:: @ 0x084FDF8C .incbin "graphics/stage/sapphire/seedot.4bpp"; diff --git a/data/rom_2.s b/data/rom_2.s index 8fe7570..36f12f1 100644 --- a/data/rom_2.s +++ b/data/rom_2.s @@ -615,13 +615,21 @@ gUnknown_086AD3FE:: @ 0x086AD3FE .incbin "baserom.gba", 0x6AD3FE, 0x38 gUnknown_086AD436:: @ 0x086AD436 - .incbin "baserom.gba", 0x6AD436, 0x20 + .2byte 0x0000, 0x0005 + .2byte 0x0001, 0x0003 + .2byte 0x0002, 0x0004 + .2byte 0x0003, 0x0004 + .2byte 0x0004, 0x0005 + .2byte 0x0005, 0x0006 + .2byte 0x0006, 0x0006 + .2byte 0x0006, 0x7000 + gUnknown_086AD456:: @ 0x086AD456 .2byte 0x0006, 0x0007, 0x0008, 0x0003, 0x0009, 0x000A, 0x0000; .2byte 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006; - .align 2, 0; + .align 2, 0 gUnknown_086AD474:: @ 0x086AD474 .4byte gUnknown_0815A8A4 .4byte gUnknown_0815C6C4 @@ -635,13 +643,39 @@ gUnknown_086AD474:: @ 0x086AD474 .4byte gUnknown_08166F84 gUnknown_086AD49C:: @ 0x086AD49C - .incbin "baserom.gba", 0x6AD49C, 0x28 + .4byte gUnknown_083EB84C + .4byte gUnknown_083ED64C + .4byte gUnknown_083EF44C + .4byte gUnknown_083F304C + .4byte gUnknown_083F4E4C + .4byte gUnknown_083F6C4C + .4byte gUnknown_083FC64C + .4byte gUnknown_083FA84C + .4byte gUnknown_083F124C + .4byte gUnknown_083F8A4C + gUnknown_086AD4C4:: @ 0x086AD4C4 - .incbin "baserom.gba", 0x6AD4C4, 0x24 + .4byte sub_25F64 + .4byte sub_19C04 + .4byte sub_21300 + .4byte sub_21578 + .4byte sub_27E08 + .4byte sub_24350 + .4byte sub_26F38 + .4byte sub_269A4 + .4byte sub_28404 gUnknown_086AD4E8:: @ 0x086AD4E8 - .incbin "baserom.gba", 0x6AD4E8, 0x24 + .4byte sub_260B8 + .4byte sub_19CC8 + .4byte sub_21320 + .4byte sub_216FC + .4byte sub_27F94 + .4byte sub_24408 + .4byte sub_27080 + .4byte sub_26A10 + .4byte sub_28544 gUnknown_086AD50C:: @ 0x086AD50C .incbin "baserom.gba", 0x6AD50C, 0x20 @@ -653,22 +687,56 @@ gUnknown_086AD580:: @ 0x086AD580 .incbin "baserom.gba", 0x6AD580, 0x1D0 gUnknown_086AD750:: @ 0x086AD750 - .incbin "baserom.gba", 0x6AD750, 0x38 + @Vector32 pairs + .4byte 0x00000974, 0x00000384 + .4byte 0x00000974, 0x000006cc + .4byte 0x000007bc, 0x0000085c + .4byte 0x00000708, 0x0000096a + .4byte 0x0000049c, 0x00000a0a + .4byte 0x000006ea, 0x00000c62 + .4byte 0x00000708, 0x00000960 + gUnknown_086AD788:: @ 0x086AD788 - .incbin "baserom.gba", 0x6AD788, 0x10 + .2byte 0x0005, 0x0008, 0x0008, 0x000B, 0x000B, 0x0002, 0x0002, 0x0005 gUnknown_086AD798:: @ 0x086AD798 - .incbin "baserom.gba", 0x6AD798, 0x4 + .2byte 0x000D, 0x000C; gUnknown_086AD79C:: @ 0x086AD79C - .incbin "baserom.gba", 0x6AD79C, 0x24 + .2byte 0, 1, 0, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1 gUnknown_086AD7C0:: @ 0x086AD7C0 - .incbin "baserom.gba", 0x6AD7C0, 0x96 + .2byte 0x000E, 0x0003, 0x0008; + .2byte 0x000F, 0x0003, 0x0009; + .2byte 0x0010, 0x0003, 0x0009; + .2byte 0x0011, 0x0003, 0x0009; + .2byte 0x0012, 0x0003, 0x000A; + .2byte 0x0013, 0x0003, 0x000A; + .2byte 0x0014, 0x0022, 0x000B; + .2byte 0x0015, 0x0007, 0x000D; + .2byte 0x0016, 0x0007, 0x000C; + .2byte 0x0017, 0x0007, 0x000D; + .2byte 0x0016, 0x0007, 0x000C; + .2byte 0x0017, 0x0007, 0x000D; + .2byte 0x0016, 0x0007, 0x000C; + .2byte 0x0017, 0x0007, 0x000D; + .2byte 0x0016, 0x0007, 0x000C; + .2byte 0x0017, 0x0007, 0x000D; + .2byte 0x0018, 0x0007, 0x000E; + .2byte 0x0019, 0x0007, 0x000F; + .2byte 0x001A, 0x001E, 0x0010; + .2byte 0x001B, 0x0004, 0x0011; + .2byte 0x001A, 0x0004, 0x0010; + .2byte 0x001B, 0x0004, 0x0011; + .2byte 0x001A, 0x0004, 0x0010; + .2byte 0x001B, 0x0004, 0x0011; + .2byte 0x001C, 0x0014, 0x0012; gUnknown_086AD856:: @ 0x086AD856 - .incbin "baserom.gba", 0x6AD856, 0xC + .2byte 28, 51 + .2byte 64, 33 + .2byte 28, 51 gUnknown_086AD862:: @ 0x086AD862 .incbin "baserom.gba", 0x6AD862, 0x17A diff --git a/graphics/board_pickups/icon1.png b/graphics/board_pickups/icon1.png new file mode 100644 index 0000000..b063529 Binary files /dev/null and b/graphics/board_pickups/icon1.png differ diff --git a/graphics/board_pickups/icon10.png b/graphics/board_pickups/icon10.png new file mode 100644 index 0000000..a43751d Binary files /dev/null and b/graphics/board_pickups/icon10.png differ diff --git a/graphics/board_pickups/icon2.png b/graphics/board_pickups/icon2.png new file mode 100644 index 0000000..7d7d5cb Binary files /dev/null and b/graphics/board_pickups/icon2.png differ diff --git a/graphics/board_pickups/icon3.png b/graphics/board_pickups/icon3.png new file mode 100644 index 0000000..43851ce Binary files /dev/null and b/graphics/board_pickups/icon3.png differ diff --git a/graphics/board_pickups/icon4.png b/graphics/board_pickups/icon4.png new file mode 100644 index 0000000..3f10ed3 Binary files /dev/null and b/graphics/board_pickups/icon4.png differ diff --git a/graphics/board_pickups/icon5.png b/graphics/board_pickups/icon5.png new file mode 100644 index 0000000..1351502 Binary files /dev/null and b/graphics/board_pickups/icon5.png differ diff --git a/graphics/board_pickups/icon6.png b/graphics/board_pickups/icon6.png new file mode 100644 index 0000000..a6ac811 Binary files /dev/null and b/graphics/board_pickups/icon6.png differ diff --git a/graphics/board_pickups/icon7.png b/graphics/board_pickups/icon7.png new file mode 100644 index 0000000..546d31e Binary files /dev/null and b/graphics/board_pickups/icon7.png differ diff --git a/graphics/board_pickups/icon8.png b/graphics/board_pickups/icon8.png new file mode 100644 index 0000000..cf174cc Binary files /dev/null and b/graphics/board_pickups/icon8.png differ diff --git a/graphics/board_pickups/icon9.png b/graphics/board_pickups/icon9.png new file mode 100644 index 0000000..336e4ec Binary files /dev/null and b/graphics/board_pickups/icon9.png differ diff --git a/graphics/stage/main/egg.png b/graphics/stage/main/egg.png new file mode 100644 index 0000000..df18ca5 Binary files /dev/null and b/graphics/stage/main/egg.png differ diff --git a/graphics/stage/main/main_stage_gfx.json b/graphics/stage/main/main_stage_gfx.json index 1c9449a..c9363e5 100644 --- a/graphics/stage/main/main_stage_gfx.json +++ b/graphics/stage/main/main_stage_gfx.json @@ -2,8 +2,6 @@ "kind": "gfx-config", "version": 1, "defaults": { - "mwidth": 0, - "mheight": 0, "oam": false, "width": 16, "palette": "" diff --git a/graphics/stage/misc/misc_gfx.json b/graphics/stage/misc/misc_gfx.json index 3cf01c2..2ad467b 100644 --- a/graphics/stage/misc/misc_gfx.json +++ b/graphics/stage/misc/misc_gfx.json @@ -2,8 +2,6 @@ "kind": "gfx-config", "version": 1, "defaults": { - "mwidth": 0, - "mheight": 0, "oam": false, "width": 16, "palette": "" @@ -13,9 +11,6 @@ "gfx_filename": "gunk_084FA20C", "mwidth":2, "mheight":2 - }, - { - "gfx_filename": "gunk_0850558C", } ] } \ No newline at end of file diff --git a/src/rom_201B8.c b/src/rom_201B8.c index 65a7b8a..c35b127 100644 --- a/src/rom_201B8.c +++ b/src/rom_201B8.c @@ -28,12 +28,12 @@ extern const s16 gUnknown_0813798C[]; extern const u8 gUnknown_081379D8[]; extern const u8 gUnknown_084B7FEC[][0x480]; extern const u8 gUnknown_084ED0CC[][0x180]; -extern const s16 gUnknown_086AD7C0[][3]; +extern const s16 gUnknown_086AD7C0[50][3]; extern const s16 gUnknown_086AD856[][2]; extern const u8 gUnknown_0845710C[][0x280]; extern const u16 gUnknown_086B2E64[58][6]; extern const u16 gUnknown_081C00E4[]; -extern const u16 gUnknown_086AD798[]; +extern const u16 gUnknown_086AD798[2]; extern const u16 gUnknown_086AD070[]; extern const u16 gUnknown_081C02E4[]; extern const s16 gUnknown_086AD79C[]; diff --git a/src/rom_27E08.c b/src/rom_27E08.c index 10c3585..d75873e 100644 --- a/src/rom_27E08.c +++ b/src/rom_27E08.c @@ -35,7 +35,7 @@ extern const u8 gUnknown_083A05CC[]; extern const u8 gUnknown_0839DDAC[]; extern const s16 gUnknown_086AD3FE[][2]; extern const u16 gUnknown_086B53E4[28][18]; -extern const s16 gUnknown_086AD52C[][3]; +extern const s16 gUnknown_086AD52C[28][3]; extern const u8 gUnknown_0202C7A0[][0x120]; extern const struct Vector32 gUnknown_086AD750[]; extern const u16 gUnknown_086AD788[]; diff --git a/src/rom_27F94.c b/src/rom_27F94.c index 431195a..79ee139 100644 --- a/src/rom_27F94.c +++ b/src/rom_27F94.c @@ -25,7 +25,7 @@ extern const s16 gUnknown_086ACF38[36]; extern const u8 gUnknown_086ACF80[]; extern const s8 gUnknown_086ACFF4[]; extern u16 gUnknown_086AD180[][7]; -extern const s16 gUnknown_086AD436[][2]; +extern const s16 gUnknown_086AD436[8][2]; extern const struct Vector16 gUnknown_086AE124[]; extern const s16 gUnknown_086AE1A4[][12]; extern const u16 gUnknown_086AE154[][10];