fix conflicts

asm/battle_bg.s

@@ -193,8 +193,8 @@ _0800F344: .4byte gBattleBgTemplates
 _0800F348: .4byte gUnknown_8248330
 	thumb_func_end sub_800F324
 
-	thumb_func_start sub_800F34C
+	thumb_func_start InitBattleBgsVideo
-sub_800F34C: @ 800F34C
+InitBattleBgsVideo: @ 800F34C
 	push {lr}
 	movs r0, 0xC5
 	bl EnableInterrupts
@@ -215,7 +215,7 @@ sub_800F34C: @ 800F34C
 	bx r0
 	.align 2, 0
 _0800F37C: .4byte 0x0000b040
-	thumb_func_end sub_800F34C
+	thumb_func_end InitBattleBgsVideo
 
 	thumb_func_start LoadBattleMenuWindowGfx
 LoadBattleMenuWindowGfx: @ 800F380

asm/battle_message.s

@@ -682,7 +682,7 @@ _080D77B8:
 _080D77C8: .4byte 0x00000181
 _080D77CC: .4byte gDisplayedStringBattle
 _080D77D0:
-	ldr r1, _080D77F0 @ =gUnknown_83FDF3C
+	ldr r1, _080D77F0 @ =gBattleStringsTable
 	adds r0, r6, 0
 	subs r0, 0xC
 	lsls r0, 2
@@ -700,7 +700,7 @@ _080D77E2:
 	pop {r0}
 	bx r0
 	.align 2, 0
-_080D77F0: .4byte gUnknown_83FDF3C
+_080D77F0: .4byte gBattleStringsTable
 	thumb_func_end BufferStringBattle
 
 	thumb_func_start BattleStringExpandPlaceholdersToDisplayedString
@@ -2230,14 +2230,14 @@ _080D847C:
 	ldrb r0, [r0, 0x2]
 	lsls r0, 8
 	orrs r1, r0
-	ldr r0, _080D8494 @ =gUnknown_83FDF3C
+	ldr r0, _080D8494 @ =gBattleStringsTable
 	subs r1, 0xC
 	lsls r1, 2
 	adds r1, r0
 	ldr r1, [r1]
 	b _080D868E
 	.align 2, 0
-_080D8494: .4byte gUnknown_83FDF3C
+_080D8494: .4byte gBattleStringsTable
 _080D8498:
 	ldrb r0, [r4, 0x1]
 	cmp r0, 0x2

asm/clear_save_data_screen.s

@@ -466,9 +466,4 @@ _080F5944: .4byte gUnknown_841EE64
 _080F5948: .4byte gUnknown_841EE68
 	thumb_func_end sub_80F5820
 
-	thumb_func_start nullsub_85
-nullsub_85: @ 80F594C
-	bx lr
-	thumb_func_end nullsub_85
-
 	.align 2, 0 @ Don't pad with nop.

asm/fldeff_flash.s

@@ -421,7 +421,7 @@ sub_80C9E4C: @ 80C9E4C
 	movs r1, 0xE0
 	movs r2, 0x20
 	bl LoadPalette
-	ldr r0, _080C9EDC @ =gUnknown_83F5854
+	ldr r0, _080C9EDC @ =gUnknown_83F5844 + 0x10
 	movs r1, 0xE0
 	movs r2, 0x10
 	bl LoadPalette
@@ -434,7 +434,7 @@ sub_80C9E4C: @ 80C9E4C
 	movs r0, 0x54
 	movs r1, 0
 	bl SetGpuReg
-	ldr r1, _080C9EE4 @ =0x00001f0c
+	ldr r1, _080C9EE4 @ =0x00001f0c =BGCNT_PRIORITY(0) | BGCNT_CHARBASE(3) | BGCNT_SCREENBASE(31)
 	movs r0, 0x8
 	bl SetGpuReg
 	movs r1, 0x8A
@@ -461,7 +461,7 @@ _080C9ECC: .4byte 0x0600c000
 _080C9ED0: .4byte gUnknown_83F5864
 _080C9ED4: .4byte 0x0600f800
 _080C9ED8: .4byte gUnknown_83F5804
-_080C9EDC: .4byte gUnknown_83F5854
+_080C9EDC: .4byte gUnknown_83F5844 + 0x10
 _080C9EE0: .4byte 0x00003e41
 _080C9EE4: .4byte 0x00001f0c
 _080C9EE8: .4byte gTasks
@@ -527,7 +527,7 @@ sub_80C9F38: @ 80C9F38
 	adds r0, r1, 0x1
 	strh r0, [r4, 0xC]
 	lsls r1, 1
-	ldr r0, _080C9F7C @ =gUnknown_83F5854
+	ldr r0, _080C9F7C @ =gUnknown_83F5844 + 0x10
 	adds r0, r1, r0
 	movs r2, 0x10
 	subs r2, r1
@@ -539,7 +539,7 @@ sub_80C9F38: @ 80C9F38
 	.align 2, 0
 _080C9F74: .4byte 0x00001010
 _080C9F78: .4byte gTasks
-_080C9F7C: .4byte gUnknown_83F5854
+_080C9F7C: .4byte gUnknown_83F5844 + 0x10
 _080C9F80:
 	ldr r0, _080C9F98 @ =gUnknown_83F5804
 	movs r1, 0

asm/party_menu.s

@@ -12790,7 +12790,7 @@ sub_8124EFC: @ 8124EFC
 	muls r5, r0
 	ldr r0, _08124F8C @ =gPlayerParty
 	adds r5, r0
-	bl sub_8138B2C
+	bl GetMoveSlotToReplace
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
@@ -14661,7 +14661,7 @@ _08125E80: .4byte sub_8125E84
 sub_8125E84: @ 8125E84
 	push {r4,r5,lr}
 	sub sp, 0xC
-	bl sub_8138B2C
+	bl GetMoveSlotToReplace
 	lsls r0, 24
 	lsrs r2, r0, 24
 	ldr r4, _08125ED0 @ =gUnknown_203B0A0
@@ -14735,7 +14735,7 @@ sub_8125F14: @ 8125F14
 	ands r0, r1
 	cmp r0, 0
 	bne _08125F46
-	bl sub_8138B2C
+	bl GetMoveSlotToReplace
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x4
@@ -14783,7 +14783,7 @@ sub_8125F5C: @ 8125F5C
 	muls r6, r0
 	ldr r0, _08125FE8 @ =gPlayerParty
 	adds r6, r0
-	bl sub_8138B2C
+	bl GetMoveSlotToReplace
 	adds r5, r0, 0
 	lsls r5, 24
 	lsrs r5, 24
@@ -14848,7 +14848,7 @@ sub_8125FFC: @ 8125FFC
 	muls r5, r0
 	ldr r0, _08126060 @ =gPlayerParty
 	adds r5, r0
-	bl sub_8138B2C
+	bl GetMoveSlotToReplace
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -14908,14 +14908,14 @@ sub_812607C: @ 812607C
 	muls r4, r0
 	ldr r0, _081260D4 @ =gPlayerParty
 	adds r4, r0
-	bl sub_8138B2C
+	bl GetMoveSlotToReplace
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
 	adds r0, r4, 0
 	bl RemoveMonPPBonus
 	ldrh r5, [r5, 0xE]
-	bl sub_8138B2C
+	bl GetMoveSlotToReplace
 	adds r2, r0, 0
 	lsls r2, 24
 	lsrs r2, 24

asm/pokemon_summary_screen.s

@@ -8406,14 +8406,14 @@ sub_8138B20: @ 8138B20
 _08138B28: .4byte gUnknown_203B16C
 	thumb_func_end sub_8138B20
 
-	thumb_func_start sub_8138B2C
+	thumb_func_start GetMoveSlotToReplace
-sub_8138B2C: @ 8138B2C
+GetMoveSlotToReplace: @ 8138B2C
 	ldr r0, _08138B34 @ =gUnknown_203B16E
 	ldrb r0, [r0]
 	bx lr
 	.align 2, 0
 _08138B34: .4byte gUnknown_203B16E
-	thumb_func_end sub_8138B2C
+	thumb_func_end GetMoveSlotToReplace
 
 	thumb_func_start sub_8138B38
 sub_8138B38: @ 8138B38

common_syms/evolution_scene.txt

@@ -0,0 +1 @@
+gCB2_AfterEvolution

data/battle_anim_special.s

@@ -1,37 +1,148 @@
 #include "constants/region_map.h"
 #include "constants/flags.h"
 #include "constants/moves.h"
+#define RGB(r, g, b) ((r) | ((g) << 5) | ((b) << 10))
 	.include "asm/macros.inc"
 	.include "constants/constants.inc"
 	.section .rodata
 	.align 2
 
 gUnknown_840BF3C:: @ 840BF3C
-	.incbin "baserom.gba", 0x40BF3C, 0xC
+	.byte  10, 2, -3, 0
+	.byte  15, 0, -4, 0
+	.byte -10, 2, -4, 0
 
 gUnknown_840BF48:: @ 840BF48
-	.incbin "baserom.gba", 0x40BF48, 0x60
+	obj_tiles gFile_graphics_battle_anims_sprites_particles_sheet, 0x0100, 55020
+	obj_tiles gFile_graphics_battle_anims_sprites_particles_sheet, 0x0100, 55021
+	obj_tiles gFile_graphics_battle_anims_sprites_particles_sheet, 0x0100, 55022
+	obj_tiles gFile_graphics_battle_anims_sprites_particles_sheet, 0x0100, 55023
+	obj_tiles gFile_graphics_battle_anims_sprites_particles_sheet, 0x0100, 55024
+	obj_tiles gFile_graphics_battle_anims_sprites_particles_sheet, 0x0100, 55025
+	obj_tiles gFile_graphics_battle_anims_sprites_particles_sheet, 0x0100, 55026
+	obj_tiles gFile_graphics_battle_anims_sprites_particles_sheet, 0x0100, 55027
+	obj_tiles gFile_graphics_battle_anims_sprites_particles_sheet, 0x0100, 55028
+	obj_tiles gFile_graphics_battle_anims_sprites_particles_sheet, 0x0100, 55029
+	obj_tiles gFile_graphics_battle_anims_sprites_particles_sheet, 0x0100, 55030
+	obj_tiles gFile_graphics_battle_anims_sprites_particles_sheet, 0x0100, 55031
 
 gUnknown_840BFA8:: @ 840BFA8
-	.incbin "baserom.gba", 0x40BFA8, 0xC0
+	obj_pal gFile_graphics_battle_anims_sprites_136_palette, 55020
+	obj_pal gFile_graphics_battle_anims_sprites_136_palette, 55021
+	obj_pal gFile_graphics_battle_anims_sprites_136_palette, 55022
+	obj_pal gFile_graphics_battle_anims_sprites_136_palette, 55023
+	obj_pal gFile_graphics_battle_anims_sprites_136_palette, 55024
+	obj_pal gFile_graphics_battle_anims_sprites_136_palette, 55025
+	obj_pal gFile_graphics_battle_anims_sprites_136_palette, 55026
+	obj_pal gFile_graphics_battle_anims_sprites_136_palette, 55027
+	obj_pal gFile_graphics_battle_anims_sprites_136_palette, 55028
+	obj_pal gFile_graphics_battle_anims_sprites_136_palette, 55029
+	obj_pal gFile_graphics_battle_anims_sprites_136_palette, 55030
+	obj_pal gFile_graphics_battle_anims_sprites_136_palette, 55031
+
+gAnimCmd_840C008:: @ 840C008
+	obj_image_anim_frame 0x0000, 1
+	obj_image_anim_frame 0x0001, 1
+	obj_image_anim_frame 0x0002, 1
+	obj_image_anim_frame 0x0000, 1, OBJ_IMAGE_ANIM_H_FLIP
+	obj_image_anim_frame 0x0002, 1
+	obj_image_anim_frame 0x0001, 1
+	obj_image_anim_jump 0x0000
+
+gAnimCmd_840C024:: @ 840C024
+	obj_image_anim_frame 0x0003, 1
+	obj_image_anim_end
+
+gAnimCmd_840C02C:: @ 840C02C
+	obj_image_anim_frame 0x0004, 1
+	obj_image_anim_end
+
+gAnimCmd_840C034:: @ 840C034
+	obj_image_anim_frame 0x0005, 1
+	obj_image_anim_end
+
+gAnimCmd_840C03C:: @ 840C03C
+	obj_image_anim_frame 0x0006, 4
+	obj_image_anim_frame 0x0007, 4
+	obj_image_anim_jump 0x0000
+
+gAnimCmd_840C048:: @ 840C048
+	obj_image_anim_frame 0x0007, 4
+	obj_image_anim_end
+
+gSpriteAnimTable_840C050::
+	.4byte gAnimCmd_840C008
+	.4byte gAnimCmd_840C024
+	.4byte gAnimCmd_840C02C
+	.4byte gAnimCmd_840C034
+	.4byte gAnimCmd_840C03C
+	.4byte gAnimCmd_840C048
 
 gUnknown_840C068:: @ 840C068
-	.incbin "baserom.gba", 0x40C068, 0xC
+	.byte 0x00, 0x00, 0x00, 0x05, 0x01, 0x02, 0x02, 0x03, 0x05, 0x05, 0x04, 0x04
 
 gUnknown_840C074:: @ 840C074
-	.incbin "baserom.gba", 0x40C074, 0x30
+	.4byte sub_80F06A4
+	.4byte sub_80F0C28
+	.4byte sub_80F0A20
+	.4byte sub_80F0B20
+	.4byte sub_80F0F10
+	.4byte sub_80F0A20
+	.4byte sub_80F091C
+	.4byte sub_80F0B20
+	.4byte sub_80F0DB4
+	.4byte sub_80F0818
+	.4byte sub_80F0C28
+	.4byte sub_80F103C
 
 gUnknown_840C0A4:: @ 840C0A4
-	.incbin "baserom.gba", 0x40C0A4, 0x60
+	spr_template 55020, 55020, gOamData_83AC9C8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+
+gUnknown_840C0BC::
+	spr_template 55021, 55021, gOamData_83AC9C8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+	spr_template 55022, 55022, gOamData_83AC9C8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+	spr_template 55023, 55023, gOamData_83AC9C8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
 gUnknown_840C104:: @ 840C104
-	.incbin "baserom.gba", 0x40C104, 0xC0
+	spr_template 55024, 55024, gOamData_83AC9C8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+	spr_template 55025, 55025, gOamData_83AC9C8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+	spr_template 55026, 55026, gOamData_83AC9C8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+	spr_template 55027, 55027, gOamData_83AC9C8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+	spr_template 55028, 55028, gOamData_83AC9C8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+	spr_template 55029, 55029, gOamData_83AC9C8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+	spr_template 55030, 55030, gOamData_83AC9C8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+	spr_template 55031, 55031, gOamData_83AC9C8, gSpriteAnimTable_840C050, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
 gUnknown_840C1C4:: @ 840C1C4
-	.incbin "baserom.gba", 0x40C1C4, 0x28
+	.2byte RGB(31, 22, 30)
+	.2byte RGB(16, 23, 30)
+	.2byte RGB(23, 30, 20)
+	.2byte RGB(31, 31, 15)
+	.2byte RGB(23, 20, 28)
+	.2byte RGB(21, 31, 25)
+	.2byte RGB(12, 25, 30)
+	.2byte RGB(30, 27, 10)
+	.2byte RGB(31, 24, 16)
+	.2byte RGB(29, 30, 30)
+	.2byte RGB(31, 17, 10)
+	.2byte RGB(31, 9, 10)
 
+gUnknown_840C1DC:: @ 840C1DC
+	.byte 0x00, 0x00, 0x01, 0x02, 0x03
+	.byte 0x04, 0x01, 0x01, 0x00, 0x01
+	.byte 0x03, 0x05, 0x06, 0x05, 0x04
+
+	.align 2
 gUnknown_840C1EC::
-	.incbin "baserom.gba", 0x40C1EC, 0x24
+	spr_template 10269, 10269, gOamData_83AC9D0, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_80F1B3C
+
+gUnknown_840C204::
+	obj_image_anim_frame 0x0040, 1
+	obj_image_anim_end
+
+gSpriteAnimTable_840C20C::
+	.4byte gUnknown_840C204
 
 gUnknown_840C210::
-	.incbin "baserom.gba", 0x40C210, 0x18
+	spr_template 10058, 10058, gOamData_83AC9D8, gSpriteAnimTable_840C20C, NULL, gDummySpriteAffineAnimTable, sub_80F1B3C
+

data/battle_message.s

@@ -1797,7 +1797,7 @@ gUnknown_83FDDEB:: @ 83FDDEB
 	.string "$"
 
 	.align 2
-gUnknown_83FDF3C:: @ 83FDF3C
+gBattleStringsTable:: @ 83FDF3C
 	.4byte gUnknown_83FB219
 	.4byte gUnknown_83FB265
 	.4byte gUnknown_83FB28E
@@ -2448,21 +2448,21 @@ gTrappingMoves:: @ 83FE664
 	.2byte MOVE_SAND_TOMB
 	.2byte 0xFFFF
 
-gUnknown_83FE672:: @ 83FE672
+gText_PkmnIsEvolving:: @ 83FE672
 	.string "What?\n"
 	.string "{STR_VAR_1} is evolving!$"
 
-gUnknown_83FE688:: @ 83FE688
+gText_CongratsPkmnEvolved:: @ 83FE688
 	.string "Congratulations! Your {STR_VAR_1}\n"
 	.string "evolved into {STR_VAR_2}!{WAIT_SE}\p"
 	.string "$"
 
-gUnknown_83FE6B5:: @ 83FE6B5
+gText_PkmnStoppedEvolving:: @ 83FE6B5
 	.string "Huh? {STR_VAR_1}\n"
 	.string "stopped evolving!\p"
 	.string "$"
 
-gUnknown_83FE6D0:: @ 83FE6D0
+gText_EllipsisQuestionMark:: @ 83FE6D0
 	.string "……?\p"
 	.string "$"
 

data/evolution_graphics.s

@@ -1,22 +0,0 @@
-#include "constants/region_map.h"
-#include "constants/flags.h"
-#include "constants/moves.h"
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-	.section .rodata
-	.align 2
-
-gUnknown_841EE84:: @ 841EE84
-	.incbin "baserom.gba", 0x41EE84, 0x40
-
-gUnknown_841EEC4:: @ 841EEC4
-	.incbin "baserom.gba", 0x41EEC4, 0x10
-
-gUnknown_841EED4:: @ 841EED4
-	.incbin "baserom.gba", 0x41EED4, 0x24
-
-gUnknown_841EEF8:: @ 841EEF8
-	.incbin "baserom.gba", 0x41EEF8, 0x18
-
-gUnknown_841EF10:: @ 841EF10
-	.incbin "baserom.gba", 0x41EF10, 0x2B8

data/evolution_scene.s

@@ -1,33 +0,0 @@
-#include "constants/species.h"
-#include "constants/items.h"
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-	.section .rodata
-	.align 2
-
-gUnknown_83F6C90:: @ 83F6C90
-	.incbin "baserom.gba", 0x3F6C90, 0x20
-
-gUnknown_83F6CB0:: @ 83F6CB0
-	.incbin "baserom.gba", 0x3F6CB0, 0x6F8
-
-gUnknown_83F73A8:: @ 83F73A8
-	.incbin "baserom.gba", 0x3F73A8, 0x4E4
-
-gUnknown_83F788C:: @ 83F788C
-	.incbin "baserom.gba", 0x3F788C, 0x4D4
-
-gUnknown_83F7D60:: @ 83F7D60
-	.incbin "baserom.gba", 0x3F7D60, 0x6A0
-
-gUnknown_83F8400:: @ 83F8400
-	.incbin "baserom.gba", 0x3F8400, 0x40
-
-gUnknown_83F8440:: @ 83F8440
-	.incbin "baserom.gba", 0x3F8440, 0x2D
-
-gUnknown_83F846D:: @ 83F846D
-	.incbin "baserom.gba", 0x3F846D, 0x10
-
-gUnknown_83F847D:: @ 83F847D
-	.incbin "baserom.gba", 0x3F847D, 0x323

data/field_ground_effect.s

@@ -1,34 +1,63 @@
 	.section .rodata
 	.align 2
 gUnknown_83A7024:: @ 83A7024
-	.incbin "baserom.gba", 0x3A7024, 0x8
+	.4byte 0x00000020, 0x00000010
 
 gUnknown_83A702C:: @ 83A702C
-	.incbin "baserom.gba", 0x3A702C, 0x18
+	.4byte MetatileBehavior_IsTallGrass_2
+	.4byte MetatileBehavior_IsLongGrass
+	.4byte MetatileBehavior_IsPuddle
+	.4byte MetatileBehavior_IsSurfable
+	.4byte MetatileBehavior_IsWaterfallBottom
+	.4byte MetatileBehavior_UnusedReturnTrue
 
 gUnknown_83A7044:: @ 83A7044
-	.incbin "baserom.gba", 0x3A7044, 0x18
+	.4byte 0x00001000, 0x00002000, 0x00004000, 0x00008000, 0x00004000, 0x00010000
 
 gUnknown_83A705C:: @ 83A705C
-	.incbin "baserom.gba", 0x3A705C, 0x10
+	.4byte MetatileBehavior_IsJumpSouth
+	.4byte MetatileBehavior_IsJumpNorth
+	.4byte MetatileBehavior_IsJumpWest
+	.4byte MetatileBehavior_IsJumpEast
 
 gUnknown_83A706C:: @ 83A706C
-	.incbin "baserom.gba", 0x3A706C, 0x10
+	.byte 0x73, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x00, 0x00, 0x73
 
 gUnknown_83A707C:: @ 83A707C
-	.incbin "baserom.gba", 0x3A707C, 0x10
+	.byte 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x00, 0x00, 0x02
 
 gUnknown_83A708C:: @ 83A708C
-	.incbin "baserom.gba", 0x3A708C, 0x10
+	.byte 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01
 
 gUnknown_83A709C:: @ 83A709C
-	.incbin "baserom.gba", 0x3A709C, 0xC
+	.4byte nullsub_26
+	.4byte DoTracksGroundEffect_Footprints
+	.4byte DoTracksGroundEffect_BikeTireTracks
 
 gUnknown_83A70A8:: @ 83A70A8
-	.incbin "baserom.gba", 0x3A70A8, 0x4
+	.byte 0x0d, 0x00, 0x18, 0x00
 
 gUnknown_83A70AC:: @ 83A70AC
-	.incbin "baserom.gba", 0x3A70AC, 0x10
+	.byte 0x01, 0x02, 0x07, 0x08, 0x01, 0x02, 0x06, 0x05, 0x05, 0x08, 0x03, 0x04, 0x06, 0x07, 0x03, 0x04
 
 gUnknown_83A70BC:: @ 83A70BC
-	.incbin "baserom.gba", 0x3A70BC, 0xE0
+	.4byte GroundEffect_SpawnOnTallGrass
+	.4byte GroundEffect_StepOnTallGrass
+	.4byte GroundEffect_SpawnOnLongGrass
+	.4byte GroundEffect_StepOnLongGrass
+	.4byte GroundEffect_WaterReflection
+	.4byte GroundEffect_IceReflection
+	.4byte GroundEffect_FlowingWater
+	.4byte GroundEffect_SandTracks
+	.4byte GroundEffect_DeepSandTracks
+	.4byte GroundEffect_Ripple
+	.4byte GroundEffect_StepOnPuddle
+	.4byte GroundEffect_SandHeap
+	.4byte GroundEffect_JumpOnTallGrass
+	.4byte GroundEffect_JumpOnLongGrass
+	.4byte GroundEffect_JumpOnShallowWater
+	.4byte GroundEffect_JumpOnWater
+	.4byte GroundEffect_JumpLandingDust
+	.4byte GroundEffect_ShortGrass
+	.4byte GroundEffect_HotSprings
+	.4byte GroundEffect_Seaweed

data/field_map_obj.s

@@ -3,19 +3,24 @@
 	.section .rodata
 	.align 2
 gUnknown_835B934:: @ 835B934
-	.incbin "baserom.gba", 0x35B934, 0x10
+	.byte 0x01, 0x01, 0x06, 0x07, 0x08, 0x09, 0x06, 0x07, 0x08, 0x09, 0x0b, 0x0b, 0x00, 0x00, 0x00, 0x00
 
 gUnknown_835B944:: @ 835B944
-	.incbin "baserom.gba", 0x35B944, 0x18
+	spr_template 0, 65535, gDummyOamData, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, ObjectCB_CameraObject
 
 gUnknown_835B95C:: @ 835B95C
-	.incbin "baserom.gba", 0x35B95C, 0xC
+	.4byte CameraObject_0
+	.4byte CameraObject_1
+	.4byte CameraObject_2
 
 gUnknown_835B968:: @ 835B968
 	.incbin "graphics/map_objects/0.gbapal"
 
 gUnknown_835B988::
-	.incbin "baserom.gba", 0x35B988, 0x1E0
+	.incbin "graphics/map_objects/unk_835B988.gbapal"
+
+gUnknown_835B9A0::
+	.space 0x1C0
 
 gUnknown_835BB68:: @ 835BB68
 	.incbin "graphics/map_objects/000.4bpp"

data/fldeff_flash.s

@@ -6,22 +6,69 @@
 	.align 2
 
 gUnknown_83F5738:: @ 83F5738
-	.incbin "baserom.gba", 0x3F5738, 0xCC
+	.byte 1, 4, 1, 0
+	.4byte sub_80C9FD4
+	.4byte sub_80CA160
+	.byte 2, 4, 1, 0
+	.4byte sub_80C9FD4
+	.4byte sub_80CA160
+	.byte 3, 4, 1, 0
+	.4byte sub_80C9FD4
+	.4byte sub_80CA160
+	.byte 5, 4, 1, 0
+	.4byte sub_80C9FD4
+	.4byte sub_80CA160
+	.byte 6, 4, 1, 0
+	.4byte sub_80C9FD4
+	.4byte sub_80CA160
+	.byte 7, 4, 1, 0
+	.4byte sub_80C9FD4
+	.4byte sub_80CA160
+	.byte 8, 4, 1, 0
+	.4byte sub_80C9FD4
+	.4byte sub_80CA160
+	.byte 9, 4, 1, 0
+	.4byte sub_80C9FD4
+	.4byte sub_80CA160
+	.byte 4, 1, 0, 1
+	.4byte sub_80C9E1C
+	.4byte sub_80CA160
+	.byte 4, 2, 0, 1
+	.4byte sub_80C9E1C
+	.4byte sub_80CA160
+	.byte 4, 3, 0, 1
+	.4byte sub_80C9E1C
+	.4byte sub_80CA160
+	.byte 4, 5, 0, 1
+	.4byte sub_80C9E1C
+	.4byte sub_80CA160
+	.byte 4, 6, 0, 1
+	.4byte sub_80C9E1C
+	.4byte sub_80CA160
+	.byte 4, 7, 0, 1
+	.4byte sub_80C9E1C
+	.4byte sub_80CA160
+	.byte 4, 8, 0, 1
+	.4byte sub_80C9E1C
+	.4byte sub_80CA160
+	.byte 4, 9, 0, 1
+	.4byte sub_80C9E1C
+	.4byte sub_80CA160
+	.byte 0, 0, 0, 0
+	.4byte NULL
+	.4byte NULL
 
 gUnknown_83F5804:: @ 83F5804
-	.incbin "baserom.gba", 0x3F5804, 0x20
+	.incbin "graphics/field_effects/flash_white.gbapal"
 
 gUnknown_83F5824:: @ 83F5824
-	.incbin "baserom.gba", 0x3F5824, 0x20
+	.incbin "graphics/field_effects/flash_black.gbapal"
 
 gUnknown_83F5844:: @ 83F5844
-	.incbin "baserom.gba", 0x3F5844, 0x10
+	.incbin "graphics/field_effects/flash_gradient.gbapal"
-
-gUnknown_83F5854:: @ 83F5854
-	.incbin "baserom.gba", 0x3F5854, 0x10
 
 gUnknown_83F5864:: @ 83F5864
-	.incbin "baserom.gba", 0x3F5864, 0x1E0
+	.incbin "graphics/field_effects/flash_effect_map.bin.lz"
 
 gUnknown_83F5A44:: @ 83F5A44
-	.incbin "baserom.gba", 0x3F5A44, 0xB4
+	.incbin "graphics/field_effects/flash_effect_tiles.4bpp.lz"

data/map_obj_80688E4.s

@@ -1,25 +1,90 @@
 	.section .rodata
 	.align 2
+
+gUnknown_83A710C::
+	.4byte little_step
+	.4byte little_step
+	.4byte little_step
+	.4byte little_step
+	.4byte little_step
+	.4byte little_step
+	.4byte little_step
+	.4byte little_step
+	.4byte little_step
+	.4byte little_step
+	.4byte little_step
+	.4byte little_step
+	.4byte little_step
+	.4byte little_step
+	.4byte little_step
+	.4byte little_step
+
+gUnknown_83A714C::
+	.4byte double_little_steps
+	.4byte double_little_steps
+	.4byte double_little_steps
+	.4byte double_little_steps
+	.4byte double_little_steps
+	.4byte double_little_steps
+	.4byte double_little_steps
+	.4byte double_little_steps
+
+gUnknown_83A716C::
+	.4byte double_little_steps
+	.4byte triple_little_steps
+	.4byte triple_little_steps
+	.4byte double_little_steps
+	.4byte triple_little_steps
+	.4byte triple_little_steps
+
+gUnknown_83A7184::
+	.4byte quad_little_steps
+	.4byte quad_little_steps
+	.4byte quad_little_steps
+	.4byte quad_little_steps
+
+gUnknown_83A7194::
+	.4byte oct_little_steps
+	.4byte oct_little_steps
+
 gUnknown_83A719C:: @ 83A719C
-	.incbin "baserom.gba", 0x3A719C, 0x14
+	.4byte gUnknown_83A710C
+	.4byte gUnknown_83A714C
+	.4byte gUnknown_83A716C
+	.4byte gUnknown_83A7184
+	.4byte gUnknown_83A7194
 
 gUnknown_83A71B0:: @ 83A71B0
-	.incbin "baserom.gba", 0x3A71B0, 0x3C
+	.2byte 0x0010, 0x0008, 0x0006, 0x0004, 0x0002
 
+gUnknown_83A71BA::
+	.byte 0xfc, 0xfa, 0xf8, 0xf6, 0xf5, 0xf4, 0xf4, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8, 0xfa, 0xfc, 0x00, 0x00
+
+gUnknown_83A71CA::
+	.byte 0x00, 0xfe, 0xfd, 0xfc, 0xfb, 0xfa, 0xfa, 0xfa, 0xfb, 0xfb, 0xfc, 0xfd, 0xfe, 0x00, 0x00, 0x00
+
+gUnknown_83A71DA::
+	.byte 0xfe, 0xfc, 0xfa, 0xf8, 0xf7, 0xf6, 0xf6, 0xf6, 0xf7, 0xf8, 0xfa, 0xfb, 0xfd, 0xfe, 0x00, 0x00
+
+	.align 2
 gUnknown_83A71EC:: @ 83A71EC
-	.incbin "baserom.gba", 0x3A71EC, 0xC
+	.4byte gUnknown_83A71BA
+	.4byte gUnknown_83A71CA
+	.4byte gUnknown_83A71DA
 
+	.align 1
 gUnknown_83A71F8:: @ 83A71F8
-	.incbin "baserom.gba", 0x3A71F8, 0x6
+	.2byte 0x10, 0x10, 0x20
 
 gUnknown_83A71FE:: @ 83A71FE
-	.incbin "baserom.gba", 0x3A71FE, 0x4
+	.byte 0, 0, 1
 
+	.align 1
 gUnknown_83A7202:: @ 83A7202
-	.incbin "baserom.gba", 0x3A7202, 0x6
+	.2byte 0x20, 0x20, 0x40
 
 gUnknown_83A7208:: @ 83A7208
-	.incbin "baserom.gba", 0x3A7208, 0x4
+	.byte 1, 1, 2
 
 	.align 2
 gUnknown_83A720C:: @ 83A720C

data/smokescreen.s

@@ -1,17 +1,55 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
 	.section .rodata
-	.balign 4
+	.align 2
 
 gUnknown_825098C:: @ 825098C
-	.incbin "baserom.gba", 0x25098C, 0x8
+	obj_tiles gFile_graphics_battle_anims_sprites_smokescreen_impact_sheet, 0x0180, 55019
 
 gUnknown_8250994:: @ 8250994
-	.incbin "baserom.gba", 0x250994, 0x60
+	obj_pal gFile_graphics_battle_anims_sprites_smokescreen_impact_palette, 55019
+
+gOamData_835099C::
+	.4byte 0x40000000, 0x00000400
+
+gAnimCmd_82509A4::
+	obj_image_anim_frame 0, 4
+	obj_image_anim_frame 4, 4
+	obj_image_anim_frame 8, 4
+	obj_image_anim_end
+
+gAnimCmd_82509B4::
+	obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP
+	obj_image_anim_frame 4, 4, OBJ_IMAGE_ANIM_H_FLIP
+	obj_image_anim_frame 8, 4, OBJ_IMAGE_ANIM_H_FLIP
+	obj_image_anim_end
+
+gAnimCmd_82509C4::
+	obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_V_FLIP
+	obj_image_anim_frame 4, 4, OBJ_IMAGE_ANIM_V_FLIP
+	obj_image_anim_frame 8, 4, OBJ_IMAGE_ANIM_V_FLIP
+	obj_image_anim_end
+
+gAnimCmd_82509D4::
+	obj_image_anim_frame 0, 4, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
+	obj_image_anim_frame 4, 4, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
+	obj_image_anim_frame 8, 4, OBJ_IMAGE_ANIM_H_FLIP | OBJ_IMAGE_ANIM_V_FLIP
+	obj_image_anim_end
+
+gSpriteAnimTable_82509E4::
+	.4byte gAnimCmd_82509A4
+	.4byte gAnimCmd_82509B4
+	.4byte gAnimCmd_82509C4
+	.4byte gAnimCmd_82509D4
 
 gUnknown_82509F4:: @ 82509F4
-	.incbin "baserom.gba", 0x2509F4, 0x18
+	spr_template 55019, 55019, gOamData_835099C, gSpriteAnimTable_82509E4, NULL, gDummySpriteAffineAnimTable, sub_804A904
 
 gSpriteSheet_EnemyShadow:: @ 8250A0C
-	.incbin "baserom.gba", 0x250A0C, 0x10
+	obj_tiles gFile_graphics_battle_interface_enemy_mon_shadow_sheet, 0x0080, 55129
+
+gOamData_8250A14::
+	.4byte 0x40004000, 0x00000c00
 
 gSpriteTemplate_EnemyShadow:: @ 8250A1C
-	.incbin "baserom.gba", 0x250A1C, 0x18
+	spr_template 55129, 55039, gOamData_8250A14, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCB_SetInvisible

data/strings.s

@@ -2904,7 +2904,7 @@ gUnknown_8419D89:: @ 8419D89
 	.string "Waiting for the other TRAINER to\n"
 	.string "finish reading your TRAINER CARD.$"
 
-gText_MenuOptionOption:: @ 8419DCC
+gText_MenuOption:: @ 8419DCC
 	.string "OPTION$"
 
 gText_TextSpeed:: @ 0x8419DD3
@@ -2955,16 +2955,16 @@ gText_SoundMono:: @ 0x8419E36
 gText_SoundStereo:: @ 0x8419E3B
 	.string "STEREO$"
 
-gUnknown_8419E42:: @ 0x8419E42
+gTextJP_Type:: @ 0x8419E42
 	.string "タイプ$"
 
-gText_ButtonTypeNormal:: @ 0x8419E46
+gText_ButtonTypeHelp:: @ 0x8419E46
 	.string "HELP$"
 
-gText_ButtonTypeLR:: @ 0x8419E4B
+gText_ButtonTypeLEqualsA:: @ 0x8419E4B
-	.string "LゅA$"
+	.string "L=A$"
 
-gText_ButtonTypeLEqualsA:: @ 0x8419E4F
+gText_ButtonTypeLR:: @ 0x8419E4F
 	.string "LR$"
 
 gText_FrameType:: @ 8419E52
@@ -4517,7 +4517,7 @@ gUnknown_841E2F5:: @ 841E2F5
 gUnknown_841E322:: @ 841E322
 	.string "{ID}$"
 
-gUnknown_841E325:: @ 841E325
+gText_CommunicationStandby5:: @ 841E325
 	.string "Communication standby…$"
 
 gDaycareText_GetAlongVeryWell:: @ 841E33C

data/tileset_anims.s

@@ -1,28 +0,0 @@
-	.section .rodata
-	.align 2
-gUnknown_83A73E0:: @ 83A73E0
-	.incbin "baserom.gba", 0x3A73E0, 0x280
-
-gUnknown_83A7660:: @ 83A7660
-	.incbin "baserom.gba", 0x3A7660, 0x2FF4
-
-gUnknown_83AA654:: @ 83AA654
-	.incbin "baserom.gba", 0x3AA654, 0x1220
-
-gUnknown_83AB874:: @ 83AB874
-	.incbin "baserom.gba", 0x3AB874, 0x540
-
-gUnknown_83ABDB4:: @ 83ABDB4
-	.incbin "baserom.gba", 0x3ABDB4, 0x434
-
-gUnknown_83AC1E8:: @ 83AC1E8
-	.incbin "baserom.gba", 0x3AC1E8, 0x410
-
-gUnknown_83AC5F8:: @ 83AC5F8
-	.incbin "baserom.gba", 0x3AC5F8, 0x1D0
-
-gUnknown_83AC7C8:: @ 83AC7C8
-	.incbin "baserom.gba", 0x3AC7C8, 0x188
-
-gUnknown_83AC950:: @ 83AC950
-	.incbin "baserom.gba", 0x3AC950, 0x10

graphics/evolution_scene/gray_transition_intro.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/evolution_scene/transition.pal

@@ -0,0 +1,35 @@
+JASC-PAL
+0100
+32
+0 0 0
+16 16 16
+24 32 32
+41 49 49
+49 65 74
+65 82 90
+74 98 115
+90 115 131
+106 131 148
+115 148 172
+131 164 189
+139 180 213
+156 197 230
+172 213 255
+0 0 0
+0 0 0
+0 0 0
+65 90 106
+74 98 115
+82 106 131
+90 115 139
+98 131 156
+106 139 164
+115 148 180
+123 156 189
+131 172 205
+139 180 213
+148 189 230
+156 197 238
+172 213 255
+0 0 0
+0 0 0

graphics/evolution_scene/unknown_5B4114.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+90 90 90
+98 106 106
+115 123 123
+131 131 131
+148 148 148
+156 164 164
+172 172 172
+189 189 189
+197 205 205
+213 213 213
+230 230 230
+246 246 246
+255 255 255
+0 0 0
+0 0 0

graphics/field_effects/flash_black.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0
+0 0 0

graphics/field_effects/flash_gradient.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+148 197 172
+16 16 16
+32 32 32
+49 49 49
+65 65 65
+82 82 82
+98 98 98
+115 115 115
+131 131 131
+148 148 148
+164 164 164
+180 180 180
+197 197 197
+213 213 213
+230 230 230
+255 255 255

graphics/field_effects/flash_white.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+255 255 255
+255 255 255
+255 255 255
+255 255 255
+255 255 255
+255 255 255
+255 255 255
+255 255 255
+255 255 255
+255 255 255
+255 255 255
+255 255 255
+255 255 255
+255 255 255
+255 255 255
+255 255 255

graphics/map_objects/unk_835B988.pal

@@ -0,0 +1,19 @@
+JASC-PAL
+0100
+16
+115 197 164
+172 123 65
+255 197 148
+222 148 115
+123 65 65
+65 65 213
+57 57 123
+115 164 197
+106 41 41
+238 238 255
+180 180 213
+255 106 74
+197 57 57
+255 222 90
+189 156 57
+0 0 0

graphics/tileset_anims/anim_4_0.bin

@@ -0,0 +1 @@
+銕銕鈿銕闔銕毫鋤沱晳櫚�持晳廊�刃銕銕銕錮銕�諏毫琮烟��旱￢�￢�抬��産���魚����鯖算�]�Z�]�歃U睆����������[���Z�鯖ズ��斈�U桍���歃��攴菅歃算沱賛沱��沱��歃���止���桍菅框算桍睆烟��烟��烟��桍歃菅歃算�賛���毯��毫毫毫��毫毫菅桍算桍睆烝��毯�燵毫毫��烟毫毫�

graphics/tileset_anims/anim_4_1.bin

@@ -0,0 +1 @@
+銕銕銕銕銕郢�賛櫑�鮫硤���絜��絜銕銕銕銕試銕睆毯����硤曉��曉��燠������撒���]���]算�U紀攤�歃�[����������[��腎�師�[U櫑愰Ⅰ�桍歃菅欹算沱賛沱��沱��歃��歃菅歃算菅�算桍睆烟��烟��澂��桍菅桍算桍沱賛沱��燵��烟�����毫毫沱毫毫��睆烟��烟��燵��沱�烟烟毫毫毯���毫

graphics/tileset_anims/anim_4_2.bin

@@ -0,0 +1 @@
+傳傳全엉靖嚮簿��犧�救�救����傳傳용�鎣靖��薄���蒿��蒿��ズ好빳�빳뻣챎かZ�]ず阜U쁨�쁨슥뻣好[�풸せ빽�ふオ糧팙百웝百뻣百�뼁翡��渤��翡��阜��阜웝阜뻣翡뼁互乷��塞��象��塞��百웝百뻣百互塞翡��翡��阜��硼샛硼슥硼硼硼硼硼硼��塞��塞��百옐硼쁜硼硼硼硼硼硼硼

graphics/tileset_anims/anim_4_3.bin

@@ -0,0 +1 @@
+銕銕銕銕銕郢�賛櫑�鮫硤���絜��絜銕銕銕銕試銕睆毯����硤曉��曉��燠������撒���]���]算�U紀攤�歃�[����������[��腎�師�[U櫑愰Ⅰ�桍沱��泅��歃��歃菅歃算沱賛沱��沱�������烟��桍菅朖算桍睆烟��烟��烟歃��歃菅歃算毫賛毫��毫毫毫毫毫毫��桍菅桍算桍睆毫�烟毫毫毫毫毫毫�

include/battle_bg.h

@@ -5,7 +5,7 @@
 
 extern const struct BgTemplate gBattleBgTemplates[];
 
-void sub_800F34C(void);
+void InitBattleBgsVideo(void);
 void DrawBattleEntryBackground(void);
 void sub_800F6FC(u8 taskId);
 void LoadBattleMenuWindowGfx(void);

include/battle_main.h

@@ -69,7 +69,7 @@ void VBlankCB_Battle(void);
 void nullsub_9(struct Sprite *sprite);
 void sub_801182C(struct Sprite *sprite);
 void sub_8011A1C(void);
-u32 sub_8011C44(u8 arrayId, u8 caseId);
+u32 GetBattleBgAttribute(u8 arrayId, u8 caseId);
 void SpriteCB_WildMon(struct Sprite *sprite);
 void SpriteCallbackDummy2(struct Sprite *sprite);
 void SpriteCB_FaintOpponentMon(struct Sprite *sprite);

include/constants/pokemon.h

@@ -83,4 +83,8 @@
 // Shiny odds
 #define SHINY_ODDS 8 // Actual probability is SHINY_ODDS/65536
 
+// Learning moves
+#define MON_ALREADY_KNOWS_MOVE 0xFFFE
+#define MON_HAS_MAX_MOVES      0xFFFF
+
 #endif // GUARD_CONSTANTS_POKEMON_H

include/dynamic_placeholder_text_util.h

@@ -1,5 +1,5 @@
-#ifndef GUARD_UNK_TEXT_UTIL_H
+#ifndef GUARD_DYNAMIC_PLACEHOLDER_TEXT_UTIL_H
-#define GUARD_UNK_TEXT_UTIL_H
+#define GUARD_DYNAMIC_PLACEHOLDER_TEXT_UTIL_H
 
 #include "global.h"
 
@@ -9,4 +9,4 @@ u8 *DynamicPlaceholderTextUtil_ExpandPlaceholders(u8 *dest, const u8 *src);
 const u8 *DynamicPlaceholderTextUtil_GetPlaceholderPtr(u8 idx);
 u8 GetColorFromTextColorTable(u16 graphicId);
 
-#endif //GUARD_UNK_TEXT_UTIL_H
+#endif //GUARD_DYNAMIC_PLACEHOLDER_TEXT_UTIL_H

include/evolution_graphics.h

@@ -10,7 +10,7 @@ u8 LaunchTask_PreEvoSparklesSet2(void);
 u8 LaunchTask_PostEvoSparklesSet1(void);
 u8 LaunchTask_PostEvoSparklesSet2AndFlash(u16 species);
 u8 LaunchTask_PostEvoSparklesSet2AndFlash_Trade(u16 species);
-u8 sub_817C3A0(u8 preEvoSpriteID, u8 postEvoSpriteID);
+u8 LaunchTask_PrePostEvoMonSprites(u8 preEvoSpriteId, u8 postEvoSpriteId);
 
 #define EvoGraphicsTaskEvoStop  data[8]
 

include/evolution_scene.h

@@ -3,10 +3,11 @@
 
 #include "global.h"
 
-void BeginEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8, u8 partyID);
-void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8, u8 partyID);
-void TradeEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8 preEvoSpriteID, u8 partyID);
-
 extern void (*gCB2_AfterEvolution)(void);
 
+void BeginEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8, u8 partyId);
+void EvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8, u8 partyId);
+void TradeEvolutionScene(struct Pokemon* mon, u16 speciesToEvolve, u8 preEvoSpriteId, u8 partyId);
+void IsMovingBackgroundTaskRunning(void);
+
 #endif // GUARD_EVOLUTION_SCENE_H

include/menu_helpers.h

@@ -12,7 +12,7 @@ struct YesNoFuncTable
 };
 
 bool16 RunTextPrinters_CheckActive(u8 textPrinterId);
-bool8 sub_80BF72C(void);
+bool32 sub_80BF72C(void);
 bool8 sub_80BF748(void);
 bool8 MenuHelpers_LinkSomething(void);
 void SetVBlankHBlankCallbacksToNull(void);

include/pokemon.h

@@ -14,7 +14,7 @@
 #define MON_DATA_OT_NAME            7
 #define MON_DATA_MARKINGS           8
 #define MON_DATA_CHECKSUM           9
-#define MON_DATA_10                10
+#define MON_DATA_ENCRYPT_SEPARATOR 10
 #define MON_DATA_SPECIES           11
 #define MON_DATA_HELD_ITEM         12
 #define MON_DATA_MOVE1             13

include/pokemon_summary_screen.h

@@ -10,7 +10,7 @@ extern const u8 *const gNatureNamePointers[];
 
 void ShowSelectMovePokemonSummaryScreen(struct Pokemon *, u8, u8, MainCallback, u16);
 void ShowPokemonSummaryScreenSet40EF(u8 mode, struct BoxPokemon *mons, u8 monIndex, u8 maxMonIndex, void (*callback)(void));
-u8 sub_8138B2C(void);
+u8 GetMoveSlotToReplace(void);
 void SummaryScreen_SetUnknownTaskId(u8 a0);
 void SummaryScreen_DestroyUnknownTask(void);
 

include/sprite.h

@@ -253,6 +253,7 @@ extern s16 gSpriteCoordOffsetY;
 extern const struct SpriteTemplate gDummySpriteTemplate;
 extern struct Sprite gSprites[];
 extern struct OamMatrix gOamMatrices[];
+extern bool8 gAffineAnimsDisabled;
 
 void ResetSpriteData(void);
 void AnimateSprites(void);

include/strings.h

@@ -688,7 +688,7 @@ extern const u8 gText_XWillBeSentToY[];
 extern const u8 gText_ByeByeVar1[];
 extern const u8 gText_XSentOverY[];
 extern const u8 gText_TakeGoodCareOfX[];
-extern const u8 gUnknown_841E325[];
+extern const u8 gText_CommunicationStandby5[];
 extern const u8 gTradeText_Cancel[];
 extern const u8 gTradeText_ChooseAPokemon[];
 extern const u8 gTradeText_Summary[];
@@ -780,11 +780,18 @@ extern const u8 gText_BattleStyleShift[];
 extern const u8 gText_BattleStyleSet[];
 extern const u8 gText_SoundMono[];
 extern const u8 gText_SoundStereo[];
-extern const u8 gText_ButtonTypeNormal[];
+extern const u8 gText_ButtonTypeHelp[];
 extern const u8 gText_ButtonTypeLR[];
 extern const u8 gText_ButtonTypeLEqualsA[];
-extern const u8 gText_MenuOptionOption[];
+extern const u8 gText_MenuOption[];
 extern const u8 gText_FrameType[];
+extern const u8 gTextJP_Type[];
 extern const u8 gText_PickSwitchCancel[];
 
+// evolution_scene
+extern const u8 gText_PkmnIsEvolving[];
+extern const u8 gText_CongratsPkmnEvolved[];
+extern const u8 gText_EllipsisQuestionMark[];
+extern const u8 gText_PkmnStoppedEvolving[];
+
 #endif //GUARD_STRINGS_H

include/trade_scene.h

@@ -7,11 +7,11 @@ void DoInGameTradeScene(void);
 void DrawTextOnTradeWindow(u8 windowId, const u8 *str, s8 speed);
 u16 GetInGameTradeSpeciesInfo(void);
 u16 GetTradeSpecies(void);
-void sub_805049C(void);
+void InitTradeSequenceBgGpuRegs(void);
-void sub_80504B0(void);
+void LinkTradeDrawWindow(void);
 void LoadTradeAnimGfx(void);
 
 extern const u16 gUnknown_826601C[];
-extern const struct WindowTemplate gUnknown_826D1CC;
+extern const struct WindowTemplate gTradeEvolutionSceneYesNoWindowTemplate;
 
 #endif //GUARD_TRADE_SCENE_H

ld_script.txt

@@ -191,7 +191,7 @@ SECTIONS {
         src/hof_pc.o(.text);
         src/field_specials.o(.text);
         src/battle_records.o(.text);
-        asm/evolution_scene.o(.text);
+        src/evolution_scene.o(.text);
         src/coins.o(.text);
         src/fldeff_strength.o(.text);
         src/battle_transition.o(.text);
@@ -219,7 +219,7 @@ SECTIONS {
         src/diploma.o(.text);
         asm/save_failed_screen.o(.text);
         asm/clear_save_data_screen.o(.text);
-        asm/evolution_graphics.o(.text);
+        src/evolution_graphics.o(.text);
         src/fldeff_teleport.o(.text);
         src/new_menu_helpers.o(.text);
         asm/box_party_pokemon_dropdown.o(.text);
@@ -418,7 +418,7 @@ SECTIONS {
         src/coord_event_weather.o(.rodata);
         data/field_tasks.o(.rodata);
         src/start_menu.o(.rodata);
-        data/tileset_anims.o(.rodata);
+        src/tileset_anims.o(.rodata);
         src/palette.o(.rodata);
         src/sound.o(.rodata);
         data/battle_anim.o(.rodata);
@@ -476,7 +476,7 @@ SECTIONS {
         data/fldeff_flash.o(.rodata);
         src/field_specials.o(.rodata);
         src/battle_records.o(.rodata);
-        data/evolution_scene.o(.rodata);
+        src/evolution_scene.o(.rodata);
         src/battle_transition.o(.rodata);
         src/battle_controller_link_partner.o(.rodata);
         data/battle_message.o(.rodata);
@@ -496,7 +496,7 @@ SECTIONS {
         data/strings.o(.rodata);
         data/save_failed_screen.o(.rodata);
         data/clear_save_data_screen.o(.rodata);
-        data/evolution_graphics.o(.rodata);
+        src/evolution_graphics.o(.rodata);
         src/new_menu_helpers.o(.rodata);
         data/box_party_pokemon_dropdown.o(.rodata);
         src/map_preview_screen.o(.rodata);

src/battle_main.c

@@ -696,7 +696,7 @@ static void CB2_InitBattleInternal(void)
     gBattle_BG3_X = 0;
     gBattle_BG3_Y = 0;
     gBattleTerrain = BattleSetup_GetTerrainId();
-    sub_800F34C();
+    InitBattleBgsVideo();
     LoadBattleTextboxAndBackground();
     ResetSpriteData();
     ResetTasks();
@@ -1774,7 +1774,7 @@ void sub_8011A1C(void)
     gBattle_BG2_Y = 0;
     gBattle_BG3_X = 0;
     gBattle_BG3_Y = 0;
-    sub_800F34C();
+    InitBattleBgsVideo();
     LoadCompressedPalette(gBattleTextboxPalette, 0, 64);
     LoadBattleMenuWindowGfx();
     ResetSpriteData();
@@ -1835,7 +1835,7 @@ static void sub_8011BB0(void)
     }
 }
 
-u32 sub_8011C44(u8 arrayId, u8 caseId)
+u32 GetBattleBgAttribute(u8 arrayId, u8 caseId)
 {
     u32 ret = 0;
 

src/battle_script_commands.c

@@ -5045,7 +5045,7 @@ static void atk5A_yesnoboxlearnmove(void)
     case 3:
         if (!gPaletteFade.active && gMain.callback2 == BattleMainCB2)
         {
-            u8 movePosition = sub_8138B2C();
+            u8 movePosition = GetMoveSlotToReplace();
 
             if (movePosition == 4)
             {
@@ -9629,7 +9629,7 @@ static void atkF2_displaydexinfo(void)
         }
         break;
     case 3:
-        sub_800F34C();
+        InitBattleBgsVideo();
         LoadBattleTextboxAndBackground();
         gBattle_BG3_X = 0x100;
         ++gBattleCommunication[0];

src/berry_pouch.c

@@ -457,7 +457,7 @@ static void CB2_InitBerryPouch(void)
 {
     while (1)
     {
-        if (sub_80BF72C() == TRUE)
+        if ((u8)sub_80BF72C() == TRUE)
             break;
         if (RunBerryPouchInit() == TRUE)
             break;
@@ -934,7 +934,7 @@ static void Task_BerryPouchMain(u8 taskId)
 {
     s16 * data = gTasks[taskId].data;
     s32 menuInput;
-    if (!gPaletteFade.active && sub_80BF72C() != TRUE)
+    if (!gPaletteFade.active && (u8)sub_80BF72C() != TRUE)
     {
         menuInput = ListMenu_ProcessInput(data[0]);
         ListMenuGetScrollAndRow(data[0], &sStaticCnt.listMenuScrollOffset, &sStaticCnt.listMenuSelectedRow);
@@ -1040,7 +1040,7 @@ static void Task_NormalContextMenu(u8 taskId)
 static void Task_NormalContextMenu_HandleInput(u8 taskId)
 {
     s8 input;
-    if (sub_80BF72C() != TRUE)
+    if ((u8)sub_80BF72C() != TRUE)
     {
         input = Menu_ProcessInputNoWrapAround();
         switch (input)

src/dark.c

@@ -82,7 +82,7 @@ static const union AffineAnimCmd gUnknown_83E7900[] =
     AFFINEANIMCMD_END,
 };
 
-static const union AffineAnimCmd *const gUnknown_83E7910[] =
+const union AffineAnimCmd *const gUnknown_83E7910[] =
 {
     gUnknown_83E7890,
     gUnknown_83E78A0,

src/evolution_graphics.c

@@ -0,0 +1,638 @@
+#include "global.h"
+#include "trig.h"
+#include "random.h"
+#include "decompress.h"
+#include "palette.h"
+#include "sound.h"
+#include "task.h"
+#include "evolution_scene.h"
+#include "evolution_graphics.h"
+#include "constants/songs.h"
+
+static void SpriteCallbackDummy_EvoSparkles(struct Sprite * sprite);
+static void EvoTask_PreEvoSparkleSet1Init(u8 taskId);
+static void EvoTask_CreatePreEvoSparkleSet1(u8 taskId);
+static void EvoTask_WaitForPre1SparklesToGoUp(u8 taskId);
+static void EvoTask_PreEvoSparkleSet2Init(u8 taskId);
+static void EvoTask_CreatePreEvoSparklesSet2(u8 taskId);
+static void EvoTask_PreEvoSparkleSet2Teardown(u8 taskId);
+static void EvoTask_PostEvoSparklesSet1Init(u8 taskId);
+static void EvoTask_CreatePostEvoSparklesSet1(u8 taskId);
+static void EvoTask_PostEvoSparklesSet1Teardown(u8 taskId);
+static void EvoTask_PostEvoSparklesSet2Init(u8 taskId);
+static void EvoTask_CreatePostEvoSparklesSet2(u8 taskId);
+static void EvoTask_PostEvoSparklesSet2Teardown(u8 taskId);
+static void EvoTask_PostEvoSparklesSet2TradeInit(u8 taskId);
+static void EvoTask_CreatePostEvoSparklesSet2Trade(u8 taskId);
+static void EvoTask_PrePostEvoMonSpritesInit(u8 taskId);
+static void EvoTask_ChooseNextEvoSpriteAnim(u8 taskId);
+static void EvoTask_ShrinkOrExpandEvoSprites(u8 taskId);
+static void PreEvoInvisible_PostEvoVisible_KillTask(u8 taskId);
+static void PreEvoVisible_PostEvoInvisible_KillTask(u8 taskId);
+
+static const u16 sEvolutionSparklesPalData[] = INCBIN_U16("graphics/misc/evolution_sprite_841EEA4.gbapal");
+static const u32 sEvolutionSparklesTileData[] = INCBIN_U32("graphics/misc/evolution_sprite_841EEA4.4bpp.lz");
+
+static const struct CompressedSpriteSheet sSpriteSheet_EvolutionSparkles[] = {
+    { sEvolutionSparklesTileData, 0x20, 1001 },
+    {}
+};
+static const struct SpritePalette sSpritePalette_EvolutionSparkles[] = {
+    { sEvolutionSparklesPalData, 1001 },
+    {}
+};
+
+static const struct OamData sOamData_EvolutionSparkles = {
+    .y = 160,
+    .priority = 1
+};
+
+static const union AnimCmd sSpriteAnim_EvolutionSparkles_0[] = {
+    ANIMCMD_FRAME(0, 8),
+    ANIMCMD_END
+};
+
+static const union AnimCmd *const sSpriteAnimTable_EvolutionSparkles[] = {
+    sSpriteAnim_EvolutionSparkles_0
+};
+
+static const struct SpriteTemplate sSpriteTemplate_EvolutionSparkles = {
+    .tileTag = 1001,
+    .paletteTag = 1001,
+    .oam = &sOamData_EvolutionSparkles,
+    .anims = sSpriteAnimTable_EvolutionSparkles,
+    .affineAnims = gDummySpriteAffineAnimTable,
+    .callback = SpriteCallbackDummy_EvoSparkles
+};
+
+static const u16 sEvolutionSparkleMatrixScales[12] = {
+    0x3C0,
+    0x380,
+    0x340,
+    0x300,
+    0x2C0,
+    0x280,
+    0x240,
+    0x200,
+    0x1C0,
+    0x180,
+    0x140,
+    0x100
+};
+
+static const s16 sUnref_841EF28[][2] = {
+    {-4, 0x10},
+    {-3, 0x30},
+    {-2, 0x50},
+    {-1, 0x70},
+    { 1, 0x70},
+    { 2, 0x50},
+    { 3, 0x30},
+    { 4, 0x10}
+};
+
+static void SpriteCallbackDummy_EvoSparkles(struct Sprite * sprite)
+{
+
+}
+
+static void SetEvoSparklesMatrices(void)
+{
+    u16 i;
+    for (i = 0; i < NELEMS(sEvolutionSparkleMatrixScales); i++)
+        SetOamMatrix(i + 20, sEvolutionSparkleMatrixScales[i], 0, 0, sEvolutionSparkleMatrixScales[i]);
+}
+
+static void SpriteCB_PreEvoSparkleSet1(struct Sprite * sprite)
+{
+    u8 mnum;
+    if (sprite->pos1.y > 8)
+    {
+        sprite->pos1.y = 88 - sprite->data[7] * sprite->data[7] / 80;
+        sprite->pos2.y = Sin((u8)sprite->data[6], sprite->data[5]) / 4;
+        sprite->pos2.x = Cos((u8) sprite->data[6], sprite->data[5]);
+        sprite->data[6] += 4;
+        if (sprite->data[7] & 1)
+            sprite->data[5]--;
+        sprite->data[7]++;
+        if (sprite->pos2.y > 0)
+            sprite->subpriority = 1;
+        else
+            sprite->subpriority = 20;
+        mnum = sprite->data[5] / 4 + 20;
+        if (mnum > 31)
+            mnum = 31;
+        sprite->oam.matrixNum = mnum;
+    }
+    else
+    {
+        DestroySprite(sprite);
+    }
+}
+
+static void CreatePreEvoSparkleSet1(u8 a0)
+{
+    u8 spriteId = CreateSprite(&sSpriteTemplate_EvolutionSparkles, 120, 88, 0);
+    if (spriteId != MAX_SPRITES)
+    {
+        gSprites[spriteId].data[5] = 48;
+        gSprites[spriteId].data[6] = a0;
+        gSprites[spriteId].data[7] = 0;
+        gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
+        gSprites[spriteId].oam.matrixNum = 31;
+        gSprites[spriteId].callback = SpriteCB_PreEvoSparkleSet1;
+    }
+}
+
+static void SpriteCB_PreEvoSparkleSet2(struct Sprite * sprite)
+{
+    if (sprite->pos1.y < 88)
+    {
+        sprite->pos1.y = 8 + sprite->data[7] * sprite->data[7] / 5;
+        sprite->pos2.y = Sin((u8)sprite->data[6], sprite->data[5]) / 4;
+        sprite->pos2.x = Cos((u8)sprite->data[6], sprite->data[5]);
+        sprite->data[5] = Sin((u8)(sprite->data[7] * 4), 40) + 8;
+        sprite->data[7]++;
+    }
+    else
+    {
+        DestroySprite(sprite);
+    }
+}
+
+static void CreatePreEvoSparkleSet2(u8 a0)
+{
+    u8 spriteId = CreateSprite(&sSpriteTemplate_EvolutionSparkles, 120, 8, 0);
+    if (spriteId != MAX_SPRITES)
+    {
+        gSprites[spriteId].data[5] = 8;
+        gSprites[spriteId].data[6] = a0;
+        gSprites[spriteId].data[7] = 0;
+        gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
+        gSprites[spriteId].oam.matrixNum = 25;
+        gSprites[spriteId].subpriority = 1;
+        gSprites[spriteId].callback = SpriteCB_PreEvoSparkleSet2;
+    }
+}
+
+static void SpriteCB_PostEvoSparkleSet1(struct Sprite * sprite)
+{
+    if (sprite->data[5] > 8)
+    {
+        sprite->pos2.y = Sin((u8)sprite->data[6], sprite->data[5]);
+        sprite->pos2.x = Cos((u8)sprite->data[6], sprite->data[5]);
+        sprite->data[5] -= sprite->data[3];
+        sprite->data[6] += 4;
+    }
+    else
+    {
+        DestroySprite(sprite);
+    }
+}
+
+static void CreatePostEvoSparkleSet1(u8 a0, u8 a1)
+{
+    u8 spriteId = CreateSprite(&sSpriteTemplate_EvolutionSparkles, 120, 56, 0);
+    if (spriteId != MAX_SPRITES)
+    {
+        gSprites[spriteId].data[3] = a1;
+        gSprites[spriteId].data[5] = 120;
+        gSprites[spriteId].data[6] = a0;
+        gSprites[spriteId].data[7] = 0;
+        gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
+        gSprites[spriteId].oam.matrixNum = 31;
+        gSprites[spriteId].subpriority = 1;
+        gSprites[spriteId].callback = SpriteCB_PostEvoSparkleSet1;
+    }
+}
+
+static void SpriteCB_PostEvoSparkleSet2(struct Sprite * sprite)
+{
+    u8 mnum;
+    if ((sprite->data[7] & 3) == 0)
+        sprite->pos1.y++;
+    if (sprite->data[6] < 128)
+    {
+        sprite->pos2.y = -Sin((u8)sprite->data[6], sprite->data[5]);
+        sprite->pos1.x = 120 + sprite->data[3] * sprite->data[7] / 3;
+        sprite->data[6]++;
+        mnum = 31 - sprite->data[6] * 12 / 128;
+        if (sprite->data[6] > 64)
+        {
+            sprite->subpriority = 1;
+        }
+        else
+        {
+            sprite->invisible = FALSE;
+            sprite->subpriority = 20;
+            if (sprite->data[6] > 112 && (sprite->data[6] & 1))
+                sprite->invisible = TRUE;
+        }
+        if (mnum < 20)
+            mnum = 20;
+        sprite->oam.matrixNum = mnum;
+        sprite->data[7]++;
+    }
+    else
+    {
+        DestroySprite(sprite);
+    }
+}
+
+static void CreatePostEvoSparkleSet2(u8 unused)
+{
+    u8 spriteId = CreateSprite(&sSpriteTemplate_EvolutionSparkles, 120, 56, 0);
+    if (spriteId != MAX_SPRITES)
+    {
+        gSprites[spriteId].data[3] = 3 - (Random() % 7);
+        gSprites[spriteId].data[5] = 48 + (Random() & 63);
+        gSprites[spriteId].data[7] = 0;
+        gSprites[spriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
+        gSprites[spriteId].oam.matrixNum = 31;
+        gSprites[spriteId].subpriority = 20;
+        gSprites[spriteId].callback = SpriteCB_PostEvoSparkleSet2;
+    }
+}
+
+void LoadEvoSparkleSpriteAndPal(void)
+{
+    LoadCompressedSpriteSheetUsingHeap(sSpriteSheet_EvolutionSparkles);
+    LoadSpritePalettes(sSpritePalette_EvolutionSparkles);
+}
+
+u8 LaunchTask_PreEvoSparklesSet1(u16 a0)
+{
+    u8 taskId = CreateTask(EvoTask_PreEvoSparkleSet1Init, 0);
+    gTasks[taskId].data[1] = a0;
+    return taskId;
+}
+
+static void EvoTask_PreEvoSparkleSet1Init(u8 taskId)
+{
+    SetEvoSparklesMatrices();
+    gTasks[taskId].data[15] = 0;
+    BeginNormalPaletteFade(3 << gTasks[taskId].data[1], 10, 0, 16, RGB_WHITE);
+    gTasks[taskId].func = EvoTask_CreatePreEvoSparkleSet1;
+    PlaySE(SE_W025);
+}
+
+static void EvoTask_CreatePreEvoSparkleSet1(u8 taskId)
+{
+    u8 i;
+    if (gTasks[taskId].data[15] < 64)
+    {
+        if ((gTasks[taskId].data[15] & 7) == 0)
+        {
+            for (i = 0; i < 4; i++)
+                CreatePreEvoSparkleSet1(2 * (gTasks[taskId].data[15] & 0x78) + 64 * i);
+        }
+        gTasks[taskId].data[15]++;
+    }
+    else
+    {
+        gTasks[taskId].data[15] = 96;
+        gTasks[taskId].func = EvoTask_WaitForPre1SparklesToGoUp;
+    }
+}
+
+static void EvoTask_WaitForPre1SparklesToGoUp(u8 taskId)
+{
+    if (gTasks[taskId].data[15] != 0)
+        gTasks[taskId].data[15]--;
+    else
+        DestroyTask(taskId);
+}
+
+u8 LaunchTask_PreEvoSparklesSet2(void)
+{
+    u8 taskId = CreateTask(EvoTask_PreEvoSparkleSet2Init, 0);
+    return taskId;
+}
+
+static void EvoTask_PreEvoSparkleSet2Init(u8 taskId)
+{
+    SetEvoSparklesMatrices();
+    gTasks[taskId].data[15] = 0;
+    gTasks[taskId].func = EvoTask_CreatePreEvoSparklesSet2;
+    PlaySE(SE_W062B);
+}
+
+static void EvoTask_CreatePreEvoSparklesSet2(u8 taskId)
+{
+    u8 i;
+    if (gTasks[taskId].data[15] < 96)
+    {
+        if (gTasks[taskId].data[15] < 6)
+        {
+            for (i = 0; i < 9; i++)
+                CreatePreEvoSparkleSet2(16 * i);
+        }
+        gTasks[taskId].data[15]++;
+    }
+    else
+    {
+        gTasks[taskId].func = EvoTask_PreEvoSparkleSet2Teardown;
+    }
+}
+
+static void EvoTask_PreEvoSparkleSet2Teardown(u8 taskId)
+{
+    DestroyTask(taskId);
+}
+
+u8 LaunchTask_PostEvoSparklesSet1(void)
+{
+    u8 taskId = CreateTask(EvoTask_PostEvoSparklesSet1Init, 0);
+    return taskId;
+}
+
+static void EvoTask_PostEvoSparklesSet1Init(u8 taskId)
+{
+    SetEvoSparklesMatrices();
+    gTasks[taskId].data[15] = 0;
+    gTasks[taskId].func = EvoTask_CreatePostEvoSparklesSet1;
+    PlaySE(SE_REAPOKE);
+}
+
+static void EvoTask_CreatePostEvoSparklesSet1(u8 taskId)
+{
+    u8 i;
+    if (gTasks[taskId].data[15] < 48)
+    {
+        if (gTasks[taskId].data[15] == 0)
+        {
+            for (i = 0; i < 16; i++)
+            {
+                CreatePostEvoSparkleSet1(i * 16, 4);
+            }
+        }
+        if (gTasks[taskId].data[15] == 32)
+        {
+            for (i = 0; i < 16; i++)
+            {
+                CreatePostEvoSparkleSet1(i * 16, 8);
+            }
+        }
+        gTasks[taskId].data[15]++;
+    }
+    else
+    {
+        gTasks[taskId].func = EvoTask_PostEvoSparklesSet1Teardown;
+    }
+}
+
+static void EvoTask_PostEvoSparklesSet1Teardown(u8 taskId)
+{
+    DestroyTask(taskId);
+}
+
+u8 LaunchTask_PostEvoSparklesSet2AndFlash(u16 species)
+{
+    u8 taskId = CreateTask(EvoTask_PostEvoSparklesSet2Init, 0);
+    gTasks[taskId].data[2] = species;
+    return taskId;
+}
+
+static void EvoTask_PostEvoSparklesSet2Init(u8 taskId)
+{
+    SetEvoSparklesMatrices();
+    gTasks[taskId].data[15] = 0;
+    IsMovingBackgroundTaskRunning();
+    CpuCopy16(&gPlttBufferFaded[32], &gPlttBufferUnfaded[32], 96);
+    BeginNormalPaletteFade(0xFFF90F1C, 0, 0, 16, RGB_WHITE);
+    gTasks[taskId].func = EvoTask_CreatePostEvoSparklesSet2;
+    PlaySE(SE_W080);
+}
+
+static void EvoTask_CreatePostEvoSparklesSet2(u8 taskId)
+{
+    u8 i;
+    if (gTasks[taskId].data[15] < 128)
+    {
+        switch (gTasks[taskId].data[15])
+        {
+        default:
+            if (gTasks[taskId].data[15] < 50)
+                CreatePostEvoSparkleSet2(Random() & 7);
+            break;
+        case 0:
+            for (i = 0; i < 8; i++)
+                CreatePostEvoSparkleSet2(i);
+            break;
+        case 32:
+            BeginNormalPaletteFade(0xFFFF0F1C, 16, 16, 0, RGB_WHITE);
+            break;
+        }
+        gTasks[taskId].data[15]++;
+    }
+    else
+    {
+        gTasks[taskId].func = EvoTask_PostEvoSparklesSet2Teardown;
+    }
+}
+
+static void EvoTask_PostEvoSparklesSet2Teardown(u8 taskId)
+{
+    if (!gPaletteFade.active)
+        DestroyTask(taskId);
+}
+
+u8 LaunchTask_PostEvoSparklesSet2AndFlash_Trade(u16 species)
+{
+    u8 taskId = CreateTask(EvoTask_PostEvoSparklesSet2TradeInit, 0);
+    gTasks[taskId].data[2] = species;
+    return taskId;
+}
+
+static void EvoTask_PostEvoSparklesSet2TradeInit(u8 taskId)
+{
+    SetEvoSparklesMatrices();
+    gTasks[taskId].data[15] = 0;
+    IsMovingBackgroundTaskRunning();
+    CpuCopy16(&gPlttBufferFaded[32], &gPlttBufferUnfaded[32], 96);
+    BeginNormalPaletteFade(0xFFF90F00, 0, 0, 16, RGB_WHITE);
+    gTasks[taskId].func = EvoTask_CreatePostEvoSparklesSet2Trade;
+    PlaySE(SE_W080);
+}
+
+static void EvoTask_CreatePostEvoSparklesSet2Trade(u8 taskId)
+{
+    u8 i;
+    if (gTasks[taskId].data[15] < 128)
+    {
+        switch (gTasks[taskId].data[15])
+        {
+        default:
+            if (gTasks[taskId].data[15] < 50)
+                CreatePostEvoSparkleSet2(Random() & 7);
+            break;
+        case 0:
+            for (i = 0; i < 8; i++)
+                CreatePostEvoSparkleSet2(i);
+            break;
+        case 32:
+            BeginNormalPaletteFade(0xFFFF0F00, 16, 16, 0, RGB_WHITE);
+            break;
+        }
+        gTasks[taskId].data[15]++;
+    }
+    else
+    {
+        gTasks[taskId].func = EvoTask_PostEvoSparklesSet2Teardown;
+    }
+}
+
+static void SpriteCallbackDummy_MonSprites(struct Sprite * sprite)
+{
+
+}
+
+#define tPreEvoSpriteId  data[1]
+#define tPostEvoSpriteId data[2]
+#define tPreEvoScale     data[3]
+#define tPostEvoScale    data[4]
+#define tDirection       data[5]
+#define tSpeed           data[6]
+
+u8 LaunchTask_PrePostEvoMonSprites(u8 preEvoSpriteId, u8 postEvoSpriteId)
+{
+    u16 i;
+    u8 taskId;
+    u16 palette[16];
+    for (i = 0; i < 16; i++)
+        palette[i] = RGB_WHITE;
+    taskId = CreateTask(EvoTask_PrePostEvoMonSpritesInit, 0);
+    gTasks[taskId].tPreEvoSpriteId = preEvoSpriteId;
+    gTasks[taskId].tPostEvoSpriteId = postEvoSpriteId;
+    gTasks[taskId].tPreEvoScale = 256;
+    gTasks[taskId].tPostEvoScale = 16;
+    SetOamMatrix(30, 0x10000 / gTasks[taskId].tPreEvoScale, 0, 0, 0x10000 / gTasks[taskId].tPreEvoScale);
+    SetOamMatrix(31, 0x10000 / gTasks[taskId].tPostEvoScale, 0, 0, 0x10000 / gTasks[taskId].tPostEvoScale);
+    gSprites[preEvoSpriteId].callback = SpriteCallbackDummy_MonSprites;
+    gSprites[preEvoSpriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
+    gSprites[preEvoSpriteId].oam.matrixNum = 30;
+    gSprites[preEvoSpriteId].invisible = FALSE;
+    CpuCopy16(palette, &gPlttBufferFaded[256 + 16 * gSprites[preEvoSpriteId].oam.paletteNum], 32);
+    gSprites[postEvoSpriteId].callback = SpriteCallbackDummy_MonSprites;
+    gSprites[postEvoSpriteId].oam.affineMode = ST_OAM_AFFINE_NORMAL;
+    gSprites[postEvoSpriteId].oam.matrixNum = 31;
+    gSprites[postEvoSpriteId].invisible = FALSE;
+    CpuCopy16(palette, &gPlttBufferFaded[256 + 16 * gSprites[postEvoSpriteId].oam.paletteNum], 32);
+    gTasks[taskId].EvoGraphicsTaskEvoStop = FALSE;
+    return taskId;
+}
+
+static void EvoTask_PrePostEvoMonSpritesInit(u8 taskId)
+{
+    gTasks[taskId].tDirection = FALSE;
+    gTasks[taskId].tSpeed = 8;
+    gTasks[taskId].func = EvoTask_ChooseNextEvoSpriteAnim;
+}
+
+static void EvoTask_ChooseNextEvoSpriteAnim(u8 taskId)
+{
+    if (gTasks[taskId].EvoGraphicsTaskEvoStop)
+    {
+        PreEvoVisible_PostEvoInvisible_KillTask(taskId);
+    }
+    else if (gTasks[taskId].tSpeed == 128)
+    {
+        PreEvoInvisible_PostEvoVisible_KillTask(taskId);
+    }
+    else
+    {
+        gTasks[taskId].tSpeed += 2;
+        gTasks[taskId].tDirection ^= TRUE;
+        gTasks[taskId].func = EvoTask_ShrinkOrExpandEvoSprites;
+    }
+}
+
+static void EvoTask_ShrinkOrExpandEvoSprites(u8 taskId)
+{
+    u8 r6;
+    if (gTasks[taskId].EvoGraphicsTaskEvoStop)
+    {
+        gTasks[taskId].func = PreEvoVisible_PostEvoInvisible_KillTask;
+    }
+    else
+    {
+        r6 = 0;
+        if (!gTasks[taskId].tDirection)
+        {
+            if (gTasks[taskId].tPreEvoScale < 0x100 - gTasks[taskId].tSpeed)
+            {
+                gTasks[taskId].tPreEvoScale += gTasks[taskId].tSpeed;
+            }
+            else
+            {
+                gTasks[taskId].tPreEvoScale = 0x100;
+                r6 = 1;
+            }
+            if (gTasks[taskId].tPostEvoScale > 0x10 + gTasks[taskId].tSpeed)
+            {
+                gTasks[taskId].tPostEvoScale -= gTasks[taskId].tSpeed;
+            }
+            else
+            {
+                gTasks[taskId].tPostEvoScale = 0x10;
+                r6++;
+            }
+        }
+        else
+        {
+            if (gTasks[taskId].tPostEvoScale < 0x100 - gTasks[taskId].tSpeed)
+            {
+                gTasks[taskId].tPostEvoScale += gTasks[taskId].tSpeed;
+            }
+            else
+            {
+                gTasks[taskId].tPostEvoScale = 0x100;
+                r6 = 1;
+            }
+            if (gTasks[taskId].tPreEvoScale > 0x10 + gTasks[taskId].tSpeed)
+            {
+                gTasks[taskId].tPreEvoScale -= gTasks[taskId].tSpeed;
+            }
+            else
+            {
+                gTasks[taskId].tPreEvoScale = 0x10;
+                r6++;
+            }
+        }
+        SetOamMatrix(30, 0x10000 / gTasks[taskId].tPreEvoScale, 0, 0, 0x10000 / gTasks[taskId].tPreEvoScale);
+        SetOamMatrix(31, 0x10000 / gTasks[taskId].tPostEvoScale, 0, 0, 0x10000 / gTasks[taskId].tPostEvoScale);
+        if (r6 == 2)
+        {
+            gTasks[taskId].func = EvoTask_ChooseNextEvoSpriteAnim;
+        }
+    }
+}
+
+static void PreEvoInvisible_PostEvoVisible_KillTask(u8 taskId)
+{
+    gSprites[gTasks[taskId].tPreEvoSpriteId].oam.affineMode = ST_OAM_AFFINE_OFF;
+    gSprites[gTasks[taskId].tPreEvoSpriteId].oam.matrixNum = 0;
+    gSprites[gTasks[taskId].tPreEvoSpriteId].invisible = TRUE;
+    gSprites[gTasks[taskId].tPostEvoSpriteId].oam.affineMode = ST_OAM_AFFINE_OFF;
+    gSprites[gTasks[taskId].tPostEvoSpriteId].oam.matrixNum = 0;
+    gSprites[gTasks[taskId].tPostEvoSpriteId].invisible = FALSE;
+    DestroyTask(taskId);
+}
+
+static void PreEvoVisible_PostEvoInvisible_KillTask(u8 taskId)
+{
+    gSprites[gTasks[taskId].tPreEvoSpriteId].oam.affineMode = ST_OAM_AFFINE_OFF;
+    gSprites[gTasks[taskId].tPreEvoSpriteId].oam.matrixNum = 0;
+    gSprites[gTasks[taskId].tPreEvoSpriteId].invisible = FALSE;
+    gSprites[gTasks[taskId].tPostEvoSpriteId].oam.affineMode = ST_OAM_AFFINE_OFF;
+    gSprites[gTasks[taskId].tPostEvoSpriteId].oam.matrixNum = 0;
+    gSprites[gTasks[taskId].tPostEvoSpriteId].invisible = TRUE;
+    DestroyTask(taskId);
+}
+
+#undef tPreEvoSpriteId
+#undef tPostEvoSpriteId
+#undef tPreEvoScale
+#undef tPostEvoScale
+#undef tDirection
+#undef tSpeed

src/ice.c

@@ -135,7 +135,7 @@ static const union AnimCmd *const gUnknown_83E632C[] =
     gUnknown_83E6308,
 };
 
-static const union AnimCmd *const gUnknown_83E6330[] =
+const union AnimCmd *const gUnknown_83E6330[] =
 {
     gUnknown_83E6310,
 };

src/item_pc.c

@@ -384,7 +384,7 @@ static bool8 ItemPc_DoGfxSetup(void)
         gMain.state++;
         break;
     case 20:
-        if (sub_80BF72C() != TRUE)
+        if ((u8)sub_80BF72C() != TRUE)
             gMain.state++;
         break;
     default:

src/menu_helpers.c

@@ -125,17 +125,17 @@ bool8 MenuHelpers_LinkSomething(void)
         return FALSE;
 }
 
-bool8 sub_80BF72C(void)
+bool32 sub_80BF72C(void)
 {
     if (!MenuHelpers_LinkSomething())
         return FALSE;
     else
-        return sub_8058244();
+        return (u8)sub_8058244();
 }
 
 bool8 sub_80BF748(void)
 {
-    if (sub_80BF72C() == TRUE)
+    if ((u8)sub_80BF72C() == TRUE)
         return TRUE;
     else if (sub_800B270() != TRUE)
         return FALSE;