fix PR merge 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/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_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_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

@@ -31,4 +31,4 @@ gUnknown_83A70AC:: @ 83A70AC
 	.incbin "baserom.gba", 0x3A70AC, 0x10
 
 gUnknown_83A70BC:: @ 83A70BC
-	.incbin "baserom.gba", 0x3A70BC, 0xE0
+	.incbin "baserom.gba", 0x3A70BC, 0x50

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

@@ -4517,7 +4517,7 @@ gUnknown_841E2F5:: @ 841E2F5
 gUnknown_841E322:: @ 841E322
 	.string "{ID}$"
 
-gUnknown_841E325:: @ 841E325
+gText_CommunicationStandby5:: @ 841E325
 	.string "Communication standby…$"
 
 gDaycareText_GetAlongVeryWell:: @ 841E33C

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

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/evolution_scene.h

@@ -3,11 +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 sub_80D0474(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/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[];
@@ -788,4 +788,10 @@ 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

@@ -190,7 +190,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);
@@ -474,7 +474,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);

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/evolution_graphics.c

@@ -397,7 +397,7 @@ static void EvoTask_PostEvoSparklesSet2Init(u8 taskId)
 {
     SetEvoSparklesMatrices();
     gTasks[taskId].data[15] = 0;
-    sub_80D0474();
+    IsMovingBackgroundTaskRunning();
     CpuCopy16(&gPlttBufferFaded[32], &gPlttBufferUnfaded[32], 96);
     BeginNormalPaletteFade(0xFFF90F1C, 0, 0, 16, RGB_WHITE);
     gTasks[taskId].func = EvoTask_CreatePostEvoSparklesSet2;
@@ -448,7 +448,7 @@ static void EvoTask_PostEvoSparklesSet2TradeInit(u8 taskId)
 {
     SetEvoSparklesMatrices();
     gTasks[taskId].data[15] = 0;
-    sub_80D0474();
+    IsMovingBackgroundTaskRunning();
     CpuCopy16(&gPlttBufferFaded[32], &gPlttBufferUnfaded[32], 96);
     BeginNormalPaletteFade(0xFFF90F00, 0, 0, 16, RGB_WHITE);
     gTasks[taskId].func = EvoTask_CreatePostEvoSparklesSet2Trade;

src/pokemon.c

@@ -2899,7 +2899,7 @@ u32 GetBoxMonData(struct BoxPokemon *boxMon, s32 field, u8 *data)
     struct PokemonSubstruct2 *substruct2 = NULL;
     struct PokemonSubstruct3 *substruct3 = NULL;
 
-    if (field > MON_DATA_10)
+    if (field > MON_DATA_ENCRYPT_SEPARATOR)
     {
         substruct0 = &(GetSubstruct(boxMon, boxMon->personality, 0)->type0);
         substruct1 = &(GetSubstruct(boxMon, boxMon->personality, 1)->type1);
@@ -2995,7 +2995,7 @@ u32 GetBoxMonData(struct BoxPokemon *boxMon, s32 field, u8 *data)
     case MON_DATA_CHECKSUM:
         retVal = boxMon->checksum;
         break;
-    case MON_DATA_10:
+    case MON_DATA_ENCRYPT_SEPARATOR:
         retVal = boxMon->unknown;
         break;
     case MON_DATA_SPECIES:
@@ -3236,7 +3236,7 @@ u32 GetBoxMonData(struct BoxPokemon *boxMon, s32 field, u8 *data)
         break;
     }
 
-    if (field > MON_DATA_10)
+    if (field > MON_DATA_ENCRYPT_SEPARATOR)
         EncryptBoxMon(boxMon);
 
     return retVal;
@@ -3323,7 +3323,7 @@ void SetBoxMonData(struct BoxPokemon *boxMon, s32 field, const void *dataArg)
     struct PokemonSubstruct2 *substruct2 = NULL;
     struct PokemonSubstruct3 *substruct3 = NULL;
 
-    if (field > MON_DATA_10)
+    if (field > MON_DATA_ENCRYPT_SEPARATOR)
     {
         substruct0 = &(GetSubstruct(boxMon, boxMon->personality, 0)->type0);
         substruct1 = &(GetSubstruct(boxMon, boxMon->personality, 1)->type1);
@@ -3382,7 +3382,7 @@ void SetBoxMonData(struct BoxPokemon *boxMon, s32 field, const void *dataArg)
     case MON_DATA_CHECKSUM:
         SET16(boxMon->checksum);
         break;
-    case MON_DATA_10:
+    case MON_DATA_ENCRYPT_SEPARATOR:
         SET16(boxMon->unknown);
         break;
     case MON_DATA_SPECIES:
@@ -3582,7 +3582,7 @@ void SetBoxMonData(struct BoxPokemon *boxMon, s32 field, const void *dataArg)
         break;
     }
 
-    if (field > MON_DATA_10)
+    if (field > MON_DATA_ENCRYPT_SEPARATOR)
     {
         boxMon->checksum = CalculateBoxMonChecksum(boxMon);
         EncryptBoxMon(boxMon);

src/trade_scene.c

@@ -488,7 +488,7 @@ static const struct WindowTemplate gUnknown_826D1BC[] = {
     }, DUMMY_WIN_TEMPLATE
 };
 
-const struct WindowTemplate gUnknown_826D1CC = {
+const struct WindowTemplate gTradeEvolutionSceneYesNoWindowTemplate = {
     .bg = 0,
     .tilemapLeft = 21,
     .tilemapTop = 9,
@@ -881,7 +881,7 @@ void CB2_InitTradeAnim_LinkTrade(void)
         break;
     case 8:
         LoadTradeMonPic(1, 1);
-        sub_80504B0();
+        LinkTradeDrawWindow();
         gMain.state++;
         break;
     case 9:
@@ -899,7 +899,7 @@ void CB2_InitTradeAnim_LinkTrade(void)
         gMain.state++;
         break;
     case 11:
-        sub_805049C();
+        InitTradeSequenceBgGpuRegs();
         TradeBufferOTnameAndNicknames();
         gMain.state++;
         break;
@@ -922,13 +922,13 @@ void CB2_InitTradeAnim_LinkTrade(void)
     UpdatePaletteFade();
 }
 
-void sub_805049C(void)
+void InitTradeSequenceBgGpuRegs(void)
 {
     SetTradeSequenceBgGpuRegs(5);
     SetTradeSequenceBgGpuRegs(0);
 }
 
-void sub_80504B0(void)
+void LinkTradeDrawWindow(void)
 {
     FillWindowPixelBuffer(0, PIXEL_FILL(15));
     PutWindowTilemap(0);
@@ -2552,7 +2552,7 @@ static void sub_8053E8C(void)
     {
     case 0:
         gMain.state++;
-        StringExpandPlaceholders(gStringVar4, gUnknown_841E325);
+        StringExpandPlaceholders(gStringVar4, gText_CommunicationStandby5);
         DrawTextOnTradeWindow(0, gStringVar4, 0);
         break;
     case 1:

sym_common.txt

@@ -94,10 +94,9 @@ gUnknown_3005354: @ 3005354
 
 	.align 2
 	.include "field_specials.o"
-
+	.align 2
-gCB2_AfterEvolution: @ 300537C
+	.include "evolution_scene.o"
-	.space 0x4
+	.align 2
-
 	.include "save.o"
 
 	.align 2

sym_ewram.txt

@@ -420,13 +420,8 @@ gPlayerFacingPosition: @ 2039A04
 	.include "src/field_specials.o"
 	.align 2
 	.include "src/battle_records.o"
-
+	.align 2
-gUnknown_2039A20: @ 2039A20
+	.include "src/evolution_scene.o"
-	.space 0x4
-
-gUnknown_2039A24: @ 2039A24
-	.space 0x4
-
 	.align 2
 	.include "src/coins.o"
 	.align 2