Dump Evolution item pickup, initial sprites (#198)
* Evo appear gfx * leafstone * all but mismatched sun * sun alt appear/sparkle * update list name
40
data/rom_1.s
|
|
@ -1405,38 +1405,38 @@ gUnknown_08158284:: @ 0x08158284
|
|||
gUnknown_0815A6A4:: @ 0x0815A6A4
|
||||
.incbin "baserom.gba", 0x15A6A4, 0x200
|
||||
|
||||
gUnknown_0815A8A4:: @ 0x0815A8A4
|
||||
.incbin "baserom.gba", 0x15A8A4, 0x1C20
|
||||
gEvoExAppear_Gfx:: @ 0x0815A8A4
|
||||
.incbin "graphics/board_pickups/evo_item_ex.4bpp";
|
||||
|
||||
gUnknown_0815C4C4:: @ 0x0815C4C4
|
||||
.incbin "baserom.gba", 0x15C4C4, 0x200
|
||||
|
||||
gUnknown_0815C6C4:: @ 0x0815C6C4
|
||||
.incbin "baserom.gba", 0x15C6C4, 0x1C20
|
||||
gEvoLeafAppear_Gfx:: @ 0x0815C6C4
|
||||
.incbin "graphics/board_pickups/evo_item_leaf.4bpp";
|
||||
|
||||
gUnknown_0815E2E4:: @ 0x0815E2E4
|
||||
.incbin "baserom.gba", 0x15E2E4, 0x1C20
|
||||
gEvoFireAppear_Gfx:: @ 0x0815E2E4
|
||||
.incbin "graphics/board_pickups/evo_item_fire.4bpp";
|
||||
|
||||
gUnknown_0815FF04:: @ 0x0815FF04
|
||||
.incbin "baserom.gba", 0x15FF04, 0x1C20
|
||||
gEvoHeartAppear_Gfx:: @ 0x0815FF04
|
||||
.incbin "graphics/board_pickups/evo_item_heart.4bpp";
|
||||
|
||||
gUnknown_08161B24:: @ 0x08161B24
|
||||
.incbin "baserom.gba", 0x161B24, 0x1C20
|
||||
gEvoLinkAppear_Gfx:: @ 0x08161B24
|
||||
.incbin "graphics/board_pickups/evo_item_link.4bpp";
|
||||
|
||||
gUnknown_08163744:: @ 0x08163744
|
||||
.incbin "baserom.gba", 0x163744, 0x1C20
|
||||
gEvoMoonAppear_Gfx:: @ 0x08163744
|
||||
.incbin "graphics/board_pickups/evo_item_moon.4bpp";
|
||||
|
||||
gUnknown_08165364:: @ 0x08165364
|
||||
.incbin "baserom.gba", 0x165364, 0x1C20
|
||||
gEvoWaterAppear_Gfx:: @ 0x08165364
|
||||
.incbin "graphics/board_pickups/evo_item_water.4bpp";
|
||||
|
||||
gUnknown_08166F84:: @ 0x08166F84
|
||||
.incbin "baserom.gba", 0x166F84, 0x1C20
|
||||
gEvoBoxAppear_Gfx:: @ 0x08166F84
|
||||
.incbin "graphics/board_pickups/evo_item_box.4bpp";
|
||||
|
||||
gUnknown_08168BA4:: @ 0x08168BA4
|
||||
.incbin "baserom.gba", 0x168BA4, 0x1C20
|
||||
gEvoSunAppear_Gfx:: @ 0x08168BA4
|
||||
.incbin "graphics/board_pickups/evo_item_sun.4bpp";
|
||||
|
||||
gUnknown_0816A7C4:: @ 0x0816A7C4
|
||||
.incbin "baserom.gba", 0x16A7C4, 0x1C20
|
||||
gEvoBoltAppear_Gfx:: @ 0x0816A7C4
|
||||
.incbin "graphics/board_pickups/evo_item_bolt.4bpp";
|
||||
|
||||
gUnknown_0816C3E4:: @ 0x0816C3E4
|
||||
.incbin "baserom.gba", 0x16C3E4, 0x42800
|
||||
|
|
|
|||
22
data/rom_2.s
|
|
@ -630,17 +630,17 @@ gUnknown_086AD456:: @ 0x086AD456
|
|||
.2byte 0x0000, 0x0001, 0x0002, 0x0003, 0x0004, 0x0005, 0x0006;
|
||||
|
||||
.align 2, 0
|
||||
gUnknown_086AD474:: @ 0x086AD474
|
||||
.4byte gUnknown_0815A8A4
|
||||
.4byte gUnknown_0815C6C4
|
||||
.4byte gUnknown_0815E2E4
|
||||
.4byte gUnknown_08161B24
|
||||
.4byte gUnknown_08163744
|
||||
.4byte gUnknown_08165364
|
||||
.4byte gUnknown_0816A7C4
|
||||
.4byte gUnknown_08168BA4
|
||||
.4byte gUnknown_0815FF04
|
||||
.4byte gUnknown_08166F84
|
||||
gEvoItemAppear_GfxList:: @ 0x086AD474
|
||||
.4byte gEvoExAppear_Gfx
|
||||
.4byte gEvoLeafAppear_Gfx
|
||||
.4byte gEvoFireAppear_Gfx
|
||||
.4byte gEvoLinkAppear_Gfx
|
||||
.4byte gEvoMoonAppear_Gfx
|
||||
.4byte gEvoWaterAppear_Gfx
|
||||
.4byte gEvoBoltAppear_Gfx
|
||||
.4byte gEvoSunAppear_Gfx
|
||||
.4byte gEvoHeartAppear_Gfx
|
||||
.4byte gEvoBoxAppear_Gfx
|
||||
|
||||
gUnknown_086AD49C:: @ 0x086AD49C
|
||||
.4byte gPickupIcon1_Gfx
|
||||
|
|
|
|||
BIN
graphics/board_pickups/evo_item_appear_1.png
Normal file
|
After Width: | Height: | Size: 136 B |
BIN
graphics/board_pickups/evo_item_appear_2.png
Normal file
|
After Width: | Height: | Size: 201 B |
BIN
graphics/board_pickups/evo_item_appear_3.png
Normal file
|
After Width: | Height: | Size: 253 B |
BIN
graphics/board_pickups/evo_item_appear_4.png
Normal file
|
After Width: | Height: | Size: 347 B |
BIN
graphics/board_pickups/evo_item_appear_5.png
Normal file
|
After Width: | Height: | Size: 159 B |
BIN
graphics/board_pickups/evo_item_appear_6.png
Normal file
|
After Width: | Height: | Size: 161 B |
BIN
graphics/board_pickups/evo_item_appear_7.png
Normal file
|
After Width: | Height: | Size: 167 B |
BIN
graphics/board_pickups/evo_item_appear_8.png
Normal file
|
After Width: | Height: | Size: 130 B |
BIN
graphics/board_pickups/evo_item_bolt_collected_fade.png
Normal file
|
After Width: | Height: | Size: 255 B |
BIN
graphics/board_pickups/evo_item_bolt_turn_1.png
Normal file
|
After Width: | Height: | Size: 135 B |
BIN
graphics/board_pickups/evo_item_bolt_turn_2.png
Normal file
|
After Width: | Height: | Size: 129 B |
BIN
graphics/board_pickups/evo_item_bolt_turn_3.png
Normal file
|
After Width: | Height: | Size: 233 B |
BIN
graphics/board_pickups/evo_item_bolt_turn_4.png
Normal file
|
After Width: | Height: | Size: 260 B |
BIN
graphics/board_pickups/evo_item_bolt_turn_5.png
Normal file
|
After Width: | Height: | Size: 228 B |
BIN
graphics/board_pickups/evo_item_box_collected_fade.png
Normal file
|
After Width: | Height: | Size: 235 B |
BIN
graphics/board_pickups/evo_item_box_turn_1.png
Normal file
|
After Width: | Height: | Size: 105 B |
BIN
graphics/board_pickups/evo_item_box_turn_2.png
Normal file
|
After Width: | Height: | Size: 86 B |
BIN
graphics/board_pickups/evo_item_box_turn_3.png
Normal file
|
After Width: | Height: | Size: 185 B |
BIN
graphics/board_pickups/evo_item_box_turn_4.png
Normal file
|
After Width: | Height: | Size: 213 B |
BIN
graphics/board_pickups/evo_item_box_turn_5.png
Normal file
|
After Width: | Height: | Size: 169 B |
BIN
graphics/board_pickups/evo_item_ex_collected_fade.png
Normal file
|
After Width: | Height: | Size: 306 B |
BIN
graphics/board_pickups/evo_item_ex_turn_1.png
Normal file
|
After Width: | Height: | Size: 77 B |
BIN
graphics/board_pickups/evo_item_ex_turn_2.png
Normal file
|
After Width: | Height: | Size: 104 B |
BIN
graphics/board_pickups/evo_item_ex_turn_3.png
Normal file
|
After Width: | Height: | Size: 218 B |
BIN
graphics/board_pickups/evo_item_ex_turn_4.png
Normal file
|
After Width: | Height: | Size: 191 B |
BIN
graphics/board_pickups/evo_item_ex_turn_5.png
Normal file
|
After Width: | Height: | Size: 154 B |
BIN
graphics/board_pickups/evo_item_fire_collected_fade.png
Normal file
|
After Width: | Height: | Size: 264 B |
BIN
graphics/board_pickups/evo_item_fire_turn_1.png
Normal file
|
After Width: | Height: | Size: 106 B |
BIN
graphics/board_pickups/evo_item_fire_turn_2.png
Normal file
|
After Width: | Height: | Size: 119 B |
BIN
graphics/board_pickups/evo_item_fire_turn_3.png
Normal file
|
After Width: | Height: | Size: 203 B |
BIN
graphics/board_pickups/evo_item_fire_turn_4.png
Normal file
|
After Width: | Height: | Size: 208 B |
BIN
graphics/board_pickups/evo_item_fire_turn_5.png
Normal file
|
After Width: | Height: | Size: 211 B |
BIN
graphics/board_pickups/evo_item_heart_collected_fade.png
Normal file
|
After Width: | Height: | Size: 304 B |
BIN
graphics/board_pickups/evo_item_heart_turn_1.png
Normal file
|
After Width: | Height: | Size: 117 B |
BIN
graphics/board_pickups/evo_item_heart_turn_2.png
Normal file
|
After Width: | Height: | Size: 128 B |
BIN
graphics/board_pickups/evo_item_heart_turn_3.png
Normal file
|
After Width: | Height: | Size: 227 B |
BIN
graphics/board_pickups/evo_item_heart_turn_4.png
Normal file
|
After Width: | Height: | Size: 199 B |
BIN
graphics/board_pickups/evo_item_heart_turn_5.png
Normal file
|
After Width: | Height: | Size: 199 B |
BIN
graphics/board_pickups/evo_item_leaf_collected_fade.png
Normal file
|
After Width: | Height: | Size: 252 B |
BIN
graphics/board_pickups/evo_item_leaf_turn_1.png
Normal file
|
After Width: | Height: | Size: 99 B |
BIN
graphics/board_pickups/evo_item_leaf_turn_2.png
Normal file
|
After Width: | Height: | Size: 101 B |
BIN
graphics/board_pickups/evo_item_leaf_turn_3.png
Normal file
|
After Width: | Height: | Size: 178 B |
BIN
graphics/board_pickups/evo_item_leaf_turn_4.png
Normal file
|
After Width: | Height: | Size: 181 B |
BIN
graphics/board_pickups/evo_item_leaf_turn_5.png
Normal file
|
After Width: | Height: | Size: 157 B |
BIN
graphics/board_pickups/evo_item_link_collected_fade.png
Normal file
|
After Width: | Height: | Size: 254 B |
BIN
graphics/board_pickups/evo_item_link_turn_1.png
Normal file
|
After Width: | Height: | Size: 123 B |
BIN
graphics/board_pickups/evo_item_link_turn_2.png
Normal file
|
After Width: | Height: | Size: 114 B |
BIN
graphics/board_pickups/evo_item_link_turn_3.png
Normal file
|
After Width: | Height: | Size: 234 B |
BIN
graphics/board_pickups/evo_item_link_turn_4.png
Normal file
|
After Width: | Height: | Size: 193 B |
BIN
graphics/board_pickups/evo_item_link_turn_5.png
Normal file
|
After Width: | Height: | Size: 203 B |
BIN
graphics/board_pickups/evo_item_moon_collected_fade.png
Normal file
|
After Width: | Height: | Size: 260 B |
BIN
graphics/board_pickups/evo_item_moon_turn_1.png
Normal file
|
After Width: | Height: | Size: 84 B |
BIN
graphics/board_pickups/evo_item_moon_turn_2.png
Normal file
|
After Width: | Height: | Size: 93 B |
BIN
graphics/board_pickups/evo_item_moon_turn_3.png
Normal file
|
After Width: | Height: | Size: 169 B |
BIN
graphics/board_pickups/evo_item_moon_turn_4.png
Normal file
|
After Width: | Height: | Size: 144 B |
BIN
graphics/board_pickups/evo_item_moon_turn_5.png
Normal file
|
After Width: | Height: | Size: 159 B |
BIN
graphics/board_pickups/evo_item_sparkle_1.png
Normal file
|
After Width: | Height: | Size: 108 B |
BIN
graphics/board_pickups/evo_item_sparkle_2.png
Normal file
|
After Width: | Height: | Size: 98 B |
BIN
graphics/board_pickups/evo_item_sparkle_3.png
Normal file
|
After Width: | Height: | Size: 98 B |
BIN
graphics/board_pickups/evo_item_sun_appear_1.png
Normal file
|
After Width: | Height: | Size: 135 B |
BIN
graphics/board_pickups/evo_item_sun_appear_2.png
Normal file
|
After Width: | Height: | Size: 202 B |
BIN
graphics/board_pickups/evo_item_sun_appear_3.png
Normal file
|
After Width: | Height: | Size: 252 B |
BIN
graphics/board_pickups/evo_item_sun_appear_4.png
Normal file
|
After Width: | Height: | Size: 345 B |
BIN
graphics/board_pickups/evo_item_sun_appear_5.png
Normal file
|
After Width: | Height: | Size: 159 B |
BIN
graphics/board_pickups/evo_item_sun_appear_6.png
Normal file
|
After Width: | Height: | Size: 161 B |
BIN
graphics/board_pickups/evo_item_sun_appear_7.png
Normal file
|
After Width: | Height: | Size: 167 B |
BIN
graphics/board_pickups/evo_item_sun_appear_8.png
Normal file
|
After Width: | Height: | Size: 130 B |
BIN
graphics/board_pickups/evo_item_sun_collected_fade.png
Normal file
|
After Width: | Height: | Size: 311 B |
BIN
graphics/board_pickups/evo_item_sun_sparkle_1.png
Normal file
|
After Width: | Height: | Size: 108 B |
BIN
graphics/board_pickups/evo_item_sun_sparkle_2.png
Normal file
|
After Width: | Height: | Size: 98 B |
BIN
graphics/board_pickups/evo_item_sun_sparkle_3.png
Normal file
|
After Width: | Height: | Size: 98 B |
BIN
graphics/board_pickups/evo_item_sun_turn_1.png
Normal file
|
After Width: | Height: | Size: 109 B |
BIN
graphics/board_pickups/evo_item_sun_turn_2.png
Normal file
|
After Width: | Height: | Size: 114 B |
BIN
graphics/board_pickups/evo_item_sun_turn_3.png
Normal file
|
After Width: | Height: | Size: 221 B |
BIN
graphics/board_pickups/evo_item_sun_turn_4.png
Normal file
|
After Width: | Height: | Size: 229 B |
BIN
graphics/board_pickups/evo_item_sun_turn_5.png
Normal file
|
After Width: | Height: | Size: 243 B |
BIN
graphics/board_pickups/evo_item_water_collected_fade.png
Normal file
|
After Width: | Height: | Size: 252 B |
BIN
graphics/board_pickups/evo_item_water_turn_1.png
Normal file
|
After Width: | Height: | Size: 112 B |
BIN
graphics/board_pickups/evo_item_water_turn_2.png
Normal file
|
After Width: | Height: | Size: 98 B |
BIN
graphics/board_pickups/evo_item_water_turn_3.png
Normal file
|
After Width: | Height: | Size: 199 B |
BIN
graphics/board_pickups/evo_item_water_turn_4.png
Normal file
|
After Width: | Height: | Size: 199 B |
BIN
graphics/board_pickups/evo_item_water_turn_5.png
Normal file
|
After Width: | Height: | Size: 191 B |
813
graphics/board_pickups/gfx_segments.json
Normal file
|
|
@ -0,0 +1,813 @@
|
|||
{
|
||||
"kind": "gfx-config",
|
||||
"version": 1,
|
||||
"defaults": {
|
||||
"mwidth": 0,
|
||||
"mheight": 0,
|
||||
"oam": false,
|
||||
"width": 16,
|
||||
"palette": ""
|
||||
},
|
||||
"files": [
|
||||
{
|
||||
"gfx_filename": "evo_item_ex",
|
||||
"align":1,
|
||||
"segments": [
|
||||
{
|
||||
"segfile": "evo_item_appear_1",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_2",
|
||||
"oam": true,
|
||||
"mwidth": 6,
|
||||
"mheight": 6
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_3",
|
||||
"oam": true,
|
||||
"mwidth": 6,
|
||||
"mheight": 6
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_4",
|
||||
"oam": true,
|
||||
"mwidth": 6,
|
||||
"mheight": 6
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_5",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_6",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_ex_turn_1",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_7",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_ex_turn_2",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sparkle_1",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_ex_turn_3",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sparkle_2",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_ex_turn_4",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sparkle_3",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_8",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_ex_turn_5",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_ex_collected_fade",
|
||||
"width": 2
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"gfx_filename": "evo_item_leaf",
|
||||
"align":1,
|
||||
"segments": [
|
||||
{
|
||||
"segfile": "evo_item_appear_1",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_2",
|
||||
"oam": true,
|
||||
"mwidth": 6,
|
||||
"mheight": 6
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_3",
|
||||
"oam": true,
|
||||
"mwidth": 6,
|
||||
"mheight": 6
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_4",
|
||||
"oam": true,
|
||||
"mwidth": 6,
|
||||
"mheight": 6
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_5",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_6",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_leaf_turn_1",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_7",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_leaf_turn_2",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sparkle_1",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_leaf_turn_3",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sparkle_2",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_leaf_turn_4",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sparkle_3",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_8",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_leaf_turn_5",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_leaf_collected_fade",
|
||||
"width": 2
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"gfx_filename": "evo_item_fire",
|
||||
"align":1,
|
||||
"segments": [
|
||||
{
|
||||
"segfile": "evo_item_appear_1",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_2",
|
||||
"oam": true,
|
||||
"mwidth": 6,
|
||||
"mheight": 6
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_3",
|
||||
"oam": true,
|
||||
"mwidth": 6,
|
||||
"mheight": 6
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_4",
|
||||
"oam": true,
|
||||
"mwidth": 6,
|
||||
"mheight": 6
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_5",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_6",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_fire_turn_1",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_7",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_fire_turn_2",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sparkle_1",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_fire_turn_3",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sparkle_2",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_fire_turn_4",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sparkle_3",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_8",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_fire_turn_5",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_fire_collected_fade",
|
||||
"width": 2
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"gfx_filename": "evo_item_heart",
|
||||
"align":1,
|
||||
"segments": [
|
||||
{
|
||||
"segfile": "evo_item_appear_1",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_2",
|
||||
"oam": true,
|
||||
"mwidth": 6,
|
||||
"mheight": 6
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_3",
|
||||
"oam": true,
|
||||
"mwidth": 6,
|
||||
"mheight": 6
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_4",
|
||||
"oam": true,
|
||||
"mwidth": 6,
|
||||
"mheight": 6
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_5",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_6",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_heart_turn_1",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_7",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_heart_turn_2",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sparkle_1",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_heart_turn_3",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sparkle_2",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_heart_turn_4",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sparkle_3",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_8",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_heart_turn_5",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_heart_collected_fade",
|
||||
"width": 2
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"gfx_filename": "evo_item_link",
|
||||
"align":1,
|
||||
"segments": [
|
||||
{
|
||||
"segfile": "evo_item_appear_1",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_2",
|
||||
"oam": true,
|
||||
"mwidth": 6,
|
||||
"mheight": 6
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_3",
|
||||
"oam": true,
|
||||
"mwidth": 6,
|
||||
"mheight": 6
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_4",
|
||||
"oam": true,
|
||||
"mwidth": 6,
|
||||
"mheight": 6
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_5",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_6",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_link_turn_1",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_7",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_link_turn_2",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sparkle_1",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_link_turn_3",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sparkle_2",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_link_turn_4",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sparkle_3",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_8",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_link_turn_5",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_link_collected_fade",
|
||||
"width": 2
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"gfx_filename": "evo_item_moon",
|
||||
"align":1,
|
||||
"segments": [
|
||||
{
|
||||
"segfile": "evo_item_appear_1",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_2",
|
||||
"oam": true,
|
||||
"mwidth": 6,
|
||||
"mheight": 6
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_3",
|
||||
"oam": true,
|
||||
"mwidth": 6,
|
||||
"mheight": 6
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_4",
|
||||
"oam": true,
|
||||
"mwidth": 6,
|
||||
"mheight": 6
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_5",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_6",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_moon_turn_1",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_7",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_moon_turn_2",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sparkle_1",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_moon_turn_3",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sparkle_2",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_moon_turn_4",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sparkle_3",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_8",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_moon_turn_5",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_moon_collected_fade",
|
||||
"width": 2
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"gfx_filename": "evo_item_water",
|
||||
"align":1,
|
||||
"segments": [
|
||||
{
|
||||
"segfile": "evo_item_appear_1",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_2",
|
||||
"oam": true,
|
||||
"mwidth": 6,
|
||||
"mheight": 6
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_3",
|
||||
"oam": true,
|
||||
"mwidth": 6,
|
||||
"mheight": 6
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_4",
|
||||
"oam": true,
|
||||
"mwidth": 6,
|
||||
"mheight": 6
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_5",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_6",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_water_turn_1",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_7",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_water_turn_2",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sparkle_1",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_water_turn_3",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sparkle_2",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_water_turn_4",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sparkle_3",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_8",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_water_turn_5",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_water_collected_fade",
|
||||
"width": 2
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"gfx_filename": "evo_item_box",
|
||||
"align":1,
|
||||
"segments": [
|
||||
{
|
||||
"segfile": "evo_item_appear_1",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_2",
|
||||
"oam": true,
|
||||
"mwidth": 6,
|
||||
"mheight": 6
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_3",
|
||||
"oam": true,
|
||||
"mwidth": 6,
|
||||
"mheight": 6
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_4",
|
||||
"oam": true,
|
||||
"mwidth": 6,
|
||||
"mheight": 6
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_5",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_6",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_box_turn_1",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_7",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_box_turn_2",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sparkle_1",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_box_turn_3",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sparkle_2",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_box_turn_4",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sparkle_3",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_8",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_box_turn_5",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_box_collected_fade",
|
||||
"width": 2
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"gfx_filename": "evo_item_sun",
|
||||
"align":1,
|
||||
"segments": [
|
||||
{
|
||||
"segfile": "evo_item_sun_appear_1",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sun_appear_2",
|
||||
"oam": true,
|
||||
"mwidth": 6,
|
||||
"mheight": 6
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sun_appear_3",
|
||||
"oam": true,
|
||||
"mwidth": 6,
|
||||
"mheight": 6
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sun_appear_4",
|
||||
"oam": true,
|
||||
"mwidth": 6,
|
||||
"mheight": 6
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sun_appear_5",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sun_appear_6",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sun_turn_1",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sun_appear_7",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sun_turn_2",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sun_sparkle_1",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sun_turn_3",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sun_sparkle_2",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sun_turn_4",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sun_sparkle_3",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sun_appear_8",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sun_turn_5",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sun_collected_fade",
|
||||
"width": 2
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"gfx_filename": "evo_item_bolt",
|
||||
"align":1,
|
||||
"segments": [
|
||||
{
|
||||
"segfile": "evo_item_appear_1",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_2",
|
||||
"oam": true,
|
||||
"mwidth": 6,
|
||||
"mheight": 6
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_3",
|
||||
"oam": true,
|
||||
"mwidth": 6,
|
||||
"mheight": 6
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_4",
|
||||
"oam": true,
|
||||
"mwidth": 6,
|
||||
"mheight": 6
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_5",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_6",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_bolt_turn_1",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_7",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_bolt_turn_2",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sparkle_1",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_bolt_turn_3",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sparkle_2",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_bolt_turn_4",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_sparkle_3",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_appear_8",
|
||||
"width": 4
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_bolt_turn_5",
|
||||
"width": 2
|
||||
},
|
||||
{
|
||||
"segfile": "evo_item_bolt_collected_fade",
|
||||
"width": 2
|
||||
}
|
||||
]
|
||||
}
|
||||
]
|
||||
}
|
||||
|
|
@ -47,7 +47,7 @@ extern const u8 gMainBoardEndOfBall_Gfx[];
|
|||
extern const u8 gSapphireBoardZigzagoonFx_Gfx[];
|
||||
extern const s16 gUnknown_086ACFE0[];
|
||||
extern const u16 gUnknown_086AD2DE[];
|
||||
extern const u8 *gUnknown_086AD474[];
|
||||
extern const u8 *gEvoItemAppear_GfxList[];
|
||||
extern const s16 gUnknown_086AD456[][7];
|
||||
extern const u8 gRubyBoardHatchCave_Gfx[][0x480];
|
||||
extern const u8 gUnknown_083C3C2C[][0x300];
|
||||
|
|
@ -1311,7 +1311,7 @@ void sub_4BC34(void)
|
|||
}
|
||||
break;
|
||||
case 14:
|
||||
DmaCopy16(3, gUnknown_086AD474[gCurrentPinballGame->unk25F], (void *)0x6015800, 0x1C00);
|
||||
DmaCopy16(3, gEvoItemAppear_GfxList[gCurrentPinballGame->unk25F], (void *)0x6015800, 0x1C00);
|
||||
break;
|
||||
case 15:
|
||||
DmaCopy16(3, gUnknown_08158284, (void *)0x6015800, 0x2400);
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@
|
|||
#define BONUS_CATCH_TIME 7200 //2 minutes, 60FPS
|
||||
|
||||
extern const u8 gUnknown_081C0064[];
|
||||
extern const u8 *gUnknown_086AD474[];
|
||||
extern const u8 *gEvoItemAppear_GfxList[];
|
||||
extern const u8 gUnknown_0815C4C4[][0x20];
|
||||
extern const s16 gUnknown_086AE0E6[];
|
||||
extern const u16 gUnknown_086B4202[58][15];
|
||||
|
|
@ -3380,7 +3380,7 @@ void sub_278F4(void)
|
|||
if (gCurrentPinballGame->unk26E == 80)
|
||||
{
|
||||
gCurrentPinballGame->unkE4 = 15;
|
||||
DmaCopy16(3, gUnknown_086AD474[gCurrentPinballGame->unk25F], (void *)0x06015800, 0x1C00);
|
||||
DmaCopy16(3, gEvoItemAppear_GfxList[gCurrentPinballGame->unk25F], (void *)0x06015800, 0x1C00);
|
||||
DmaCopy16(3, &gUnknown_0815C4C4[gCurrentPinballGame->unk25F], (void *)0x050003E0, 0x20);
|
||||
gCurrentPinballGame->unk626 = 0;
|
||||
gCurrentPinballGame->unk628 = 0;
|
||||
|
|
|
|||