Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 20 additions & 20 deletions data/rom_1.s
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 11 additions & 11 deletions data/rom_2.s
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Binary file added graphics/board_pickups/evo_item_appear_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/board_pickups/evo_item_appear_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/board_pickups/evo_item_appear_3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/board_pickups/evo_item_appear_4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/board_pickups/evo_item_appear_5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/board_pickups/evo_item_appear_6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/board_pickups/evo_item_appear_7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/board_pickups/evo_item_appear_8.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/board_pickups/evo_item_bolt_turn_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/board_pickups/evo_item_bolt_turn_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/board_pickups/evo_item_bolt_turn_3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/board_pickups/evo_item_bolt_turn_4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/board_pickups/evo_item_bolt_turn_5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/board_pickups/evo_item_box_turn_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/board_pickups/evo_item_box_turn_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/board_pickups/evo_item_box_turn_3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/board_pickups/evo_item_box_turn_4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/board_pickups/evo_item_box_turn_5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/board_pickups/evo_item_ex_turn_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/board_pickups/evo_item_ex_turn_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/board_pickups/evo_item_ex_turn_3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/board_pickups/evo_item_ex_turn_4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added graphics/board_pickups/evo_item_ex_turn_5.png
Binary file added graphics/board_pickups/evo_item_fire_turn_1.png
Binary file added graphics/board_pickups/evo_item_fire_turn_2.png
Binary file added graphics/board_pickups/evo_item_fire_turn_3.png
Binary file added graphics/board_pickups/evo_item_fire_turn_4.png
Binary file added graphics/board_pickups/evo_item_fire_turn_5.png
Binary file added graphics/board_pickups/evo_item_heart_turn_1.png
Binary file added graphics/board_pickups/evo_item_heart_turn_2.png
Binary file added graphics/board_pickups/evo_item_heart_turn_3.png
Binary file added graphics/board_pickups/evo_item_heart_turn_4.png
Binary file added graphics/board_pickups/evo_item_heart_turn_5.png
Binary file added graphics/board_pickups/evo_item_leaf_turn_1.png
Binary file added graphics/board_pickups/evo_item_leaf_turn_2.png
Binary file added graphics/board_pickups/evo_item_leaf_turn_3.png
Binary file added graphics/board_pickups/evo_item_leaf_turn_4.png
Binary file added graphics/board_pickups/evo_item_leaf_turn_5.png
Binary file added graphics/board_pickups/evo_item_link_turn_1.png
Binary file added graphics/board_pickups/evo_item_link_turn_2.png
Binary file added graphics/board_pickups/evo_item_link_turn_3.png
Binary file added graphics/board_pickups/evo_item_link_turn_4.png
Binary file added graphics/board_pickups/evo_item_link_turn_5.png
Binary file added graphics/board_pickups/evo_item_moon_turn_1.png
Binary file added graphics/board_pickups/evo_item_moon_turn_2.png
Binary file added graphics/board_pickups/evo_item_moon_turn_3.png
Binary file added graphics/board_pickups/evo_item_moon_turn_4.png
Binary file added graphics/board_pickups/evo_item_moon_turn_5.png
Binary file added graphics/board_pickups/evo_item_sparkle_1.png
Binary file added graphics/board_pickups/evo_item_sparkle_2.png
Binary file added graphics/board_pickups/evo_item_sparkle_3.png
Binary file added graphics/board_pickups/evo_item_sun_appear_1.png
Binary file added graphics/board_pickups/evo_item_sun_appear_2.png
Binary file added graphics/board_pickups/evo_item_sun_appear_3.png
Binary file added graphics/board_pickups/evo_item_sun_appear_4.png
Binary file added graphics/board_pickups/evo_item_sun_appear_5.png
Binary file added graphics/board_pickups/evo_item_sun_appear_6.png
Binary file added graphics/board_pickups/evo_item_sun_appear_7.png
Binary file added graphics/board_pickups/evo_item_sun_appear_8.png
Binary file added graphics/board_pickups/evo_item_sun_sparkle_1.png
Binary file added graphics/board_pickups/evo_item_sun_sparkle_2.png
Binary file added graphics/board_pickups/evo_item_sun_sparkle_3.png
Binary file added graphics/board_pickups/evo_item_sun_turn_1.png
Binary file added graphics/board_pickups/evo_item_sun_turn_2.png
Binary file added graphics/board_pickups/evo_item_sun_turn_3.png
Binary file added graphics/board_pickups/evo_item_sun_turn_4.png
Binary file added graphics/board_pickups/evo_item_sun_turn_5.png
Binary file added graphics/board_pickups/evo_item_water_turn_1.png
Binary file added graphics/board_pickups/evo_item_water_turn_2.png
Binary file added graphics/board_pickups/evo_item_water_turn_3.png
Binary file added graphics/board_pickups/evo_item_water_turn_4.png
Binary file added graphics/board_pickups/evo_item_water_turn_5.png
Loading