reshow battle screen is decompiled

11 files changed, 118 insertions, 653 deletions

diff --git a/asm/reshow_battle_screen.s b/asm/reshow_battle_screen.s
deleted file mode 100644
index 2b7345366..000000000
--- a/asm/reshow_battle_screen.s
+++ /dev/null
@@ -1,614 +0,0 @@
-	.include "constants/gba_constants.inc"
-	.include "constants/species_constants.inc"
-	.include "asm/macros.inc"
-
-	.syntax unified
-
-	.text
-
-
-
-
-	thumb_func_start sub_807B184
-sub_807B184: @ 807B184
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0x4
-	lsls r0, 24
-	lsrs r7, r0, 24
-	ldr r0, _0807B1B8 @ =gNoOfAllBanks
-	ldrb r0, [r0]
-	cmp r7, r0
-	bcc _0807B19E
-	b _0807B4D8
-_0807B19E:
-	lsls r2, r7, 2
-	ldr r0, _0807B1BC @ =0x02017800
-	adds r0, r2, r0
-	ldrb r1, [r0]
-	movs r0, 0x4
-	ands r0, r1
-	str r2, [sp]
-	cmp r0, 0
-	beq _0807B1C0
-	adds r0, r7, 0
-	bl sub_8077F7C
-	b _0807B1C6
-	.align 2, 0
-_0807B1B8: .4byte gNoOfAllBanks
-_0807B1BC: .4byte 0x02017800
-_0807B1C0:
-	adds r0, r7, 0
-	bl sub_8077F68
-_0807B1C6:
-	lsls r0, 24
-	lsrs r0, 24
-	mov r8, r0
-	adds r0, r7, 0
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	bne _0807B1DA
-	b _0807B2D8
-_0807B1DA:
-	ldr r1, _0807B2BC @ =gBattlePartyID
-	lsls r0, r7, 1
-	adds r6, r0, r1
-	ldrh r0, [r6]
-	movs r1, 0x64
-	mov r10, r1
-	mov r1, r10
-	muls r1, r0
-	adds r0, r1, 0
-	ldr r1, _0807B2C0 @ =gEnemyParty
-	mov r9, r1
-	add r0, r9
-	movs r1, 0x39
-	bl GetMonData
-	cmp r0, 0
-	bne _0807B1FE
-	b _0807B4D8
-_0807B1FE:
-	ldrh r0, [r6]
-	mov r1, r10
-	muls r1, r0
-	adds r0, r1, 0
-	add r0, r9
-	movs r1, 0xB
-	bl GetMonData
-	adds r4, r0, 0
-	lsls r4, 16
-	lsrs r4, 16
-	adds r0, r7, 0
-	bl GetBankIdentity
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl GetMonSpriteTemplate_803C56C
-	ldr r5, _0807B2C4 @ =gUnknown_02024E8C
-	adds r0, r7, 0
-	movs r1, 0x2
-	bl sub_8077ABC
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r7, 0
-	bl sub_8079E90
-	adds r3, r0, 0
-	lsls r3, 24
-	lsrs r3, 24
-	adds r0, r5, 0
-	adds r1, r4, 0
-	mov r2, r8
-	bl CreateSprite
-	ldr r4, _0807B2C8 @ =gObjectBankIDs
-	adds r4, r7, r4
-	strb r0, [r4]
-	ldr r5, _0807B2CC @ =gSprites
-	ldrb r0, [r4]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r5
-	lsls r3, r7, 4
-	ldrb r2, [r1, 0x5]
-	movs r0, 0xF
-	ands r0, r2
-	orrs r0, r3
-	strb r0, [r1, 0x5]
-	ldrb r1, [r4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r1, r5, 0
-	adds r1, 0x1C
-	adds r0, r1
-	ldr r1, _0807B2D0 @ =SpriteCallbackDummy
-	str r1, [r0]
-	ldrb r1, [r4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r5
-	strh r7, [r0, 0x2E]
-	ldrh r0, [r6]
-	mov r1, r10
-	muls r1, r0
-	adds r0, r1, 0
-	add r0, r9
-	movs r1, 0xB
-	bl GetMonData
-	ldrb r2, [r4]
-	lsls r1, r2, 4
-	adds r1, r2
-	lsls r1, 2
-	adds r1, r5
-	strh r0, [r1, 0x32]
-	ldrb r1, [r4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r5
-	ldr r1, _0807B2D4 @ =gBattleMonForms
-	adds r1, r7, r1
-	ldrb r1, [r1]
-	bl StartSpriteAnim
-	b _0807B4AC
-	.align 2, 0
-_0807B2BC: .4byte gBattlePartyID
-_0807B2C0: .4byte gEnemyParty
-_0807B2C4: .4byte gUnknown_02024E8C
-_0807B2C8: .4byte gObjectBankIDs
-_0807B2CC: .4byte gSprites
-_0807B2D0: .4byte SpriteCallbackDummy
-_0807B2D4: .4byte gBattleMonForms
-_0807B2D8:
-	ldr r2, _0807B328 @ =gBattleTypeFlags
-	ldrh r1, [r2]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _0807B338
-	cmp r7, 0
-	bne _0807B338
-	ldr r5, _0807B32C @ =gSaveBlock2
-	ldrb r4, [r5, 0x8]
-	movs r0, 0
-	bl GetBankIdentity
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl GetMonSpriteTemplate_803C5A0
-	ldr r6, _0807B330 @ =gUnknown_02024E8C
-	ldr r1, _0807B334 @ =gTrainerBackPicCoords
-	ldrb r0, [r5, 0x8]
-	lsls r0, 2
-	adds r0, r1
-	ldrb r0, [r0]
-	movs r4, 0x8
-	subs r4, r0
-	lsls r4, 18
-	movs r0, 0xA0
-	lsls r0, 15
-	adds r4, r0
-	asrs r4, 16
-	movs r0, 0
-	bl sub_8079E90
-	adds r3, r0, 0
-	lsls r3, 24
-	lsrs r3, 24
-	adds r0, r6, 0
-	b _0807B37C
-	.align 2, 0
-_0807B328: .4byte gBattleTypeFlags
-_0807B32C: .4byte gSaveBlock2
-_0807B330: .4byte gUnknown_02024E8C
-_0807B334: .4byte gTrainerBackPicCoords
-_0807B338:
-	ldrh r1, [r2]
-	movs r0, 0x80
-	lsls r0, 2
-	ands r0, r1
-	cmp r0, 0
-	beq _0807B3D0
-	cmp r7, 0
-	bne _0807B3D0
-	movs r0, 0
-	bl GetBankIdentity
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	movs r0, 0x2
-	bl GetMonSpriteTemplate_803C5A0
-	ldr r5, _0807B3BC @ =gUnknown_02024E8C
-	ldr r0, _0807B3C0 @ =gTrainerBackPicCoords
-	ldrb r0, [r0, 0x8]
-	movs r4, 0x8
-	subs r4, r0
-	lsls r4, 18
-	movs r1, 0xA0
-	lsls r1, 15
-	adds r4, r1
-	asrs r4, 16
-	movs r0, 0
-	bl sub_8079E90
-	adds r3, r0, 0
-	lsls r3, 24
-	lsrs r3, 24
-	adds r0, r5, 0
-_0807B37C:
-	movs r1, 0x50
-	adds r2, r4, 0
-	bl CreateSprite
-	ldr r3, _0807B3C4 @ =gObjectBankIDs
-	strb r0, [r3]
-	ldr r4, _0807B3C8 @ =gSprites
-	ldrb r0, [r3]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r4
-	ldrb r2, [r1, 0x5]
-	movs r0, 0xF
-	ands r0, r2
-	strb r0, [r1, 0x5]
-	ldrb r1, [r3]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r1, r4, 0
-	adds r1, 0x1C
-	adds r0, r1
-	ldr r1, _0807B3CC @ =SpriteCallbackDummy
-	str r1, [r0]
-	ldrb r1, [r3]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4
-	strh r7, [r0, 0x2E]
-	b _0807B4AC
-	.align 2, 0
-_0807B3BC: .4byte gUnknown_02024E8C
-_0807B3C0: .4byte gTrainerBackPicCoords
-_0807B3C4: .4byte gObjectBankIDs
-_0807B3C8: .4byte gSprites
-_0807B3CC: .4byte SpriteCallbackDummy
-_0807B3D0:
-	ldr r1, _0807B4E8 @ =gBattlePartyID
-	lsls r0, r7, 1
-	adds r6, r0, r1
-	ldrh r0, [r6]
-	movs r1, 0x64
-	mov r10, r1
-	mov r1, r10
-	muls r1, r0
-	adds r0, r1, 0
-	ldr r1, _0807B4EC @ =gPlayerParty
-	mov r9, r1
-	add r0, r9
-	movs r1, 0x39
-	bl GetMonData
-	cmp r0, 0
-	beq _0807B4D8
-	ldrh r0, [r6]
-	mov r1, r10
-	muls r1, r0
-	adds r0, r1, 0
-	add r0, r9
-	movs r1, 0xB
-	bl GetMonData
-	adds r4, r0, 0
-	lsls r4, 16
-	lsrs r4, 16
-	adds r0, r7, 0
-	bl GetBankIdentity
-	adds r1, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r0, r4, 0
-	bl GetMonSpriteTemplate_803C56C
-	ldr r5, _0807B4F0 @ =gUnknown_02024E8C
-	adds r0, r7, 0
-	movs r1, 0x2
-	bl sub_8077ABC
-	adds r4, r0, 0
-	lsls r4, 24
-	lsrs r4, 24
-	adds r0, r7, 0
-	bl sub_8079E90
-	adds r3, r0, 0
-	lsls r3, 24
-	lsrs r3, 24
-	adds r0, r5, 0
-	adds r1, r4, 0
-	mov r2, r8
-	bl CreateSprite
-	ldr r4, _0807B4F4 @ =gObjectBankIDs
-	adds r4, r7, r4
-	strb r0, [r4]
-	ldr r5, _0807B4F8 @ =gSprites
-	ldrb r0, [r4]
-	lsls r1, r0, 4
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r5
-	lsls r3, r7, 4
-	ldrb r2, [r1, 0x5]
-	movs r0, 0xF
-	ands r0, r2
-	orrs r0, r3
-	strb r0, [r1, 0x5]
-	ldrb r1, [r4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r1, r5, 0
-	adds r1, 0x1C
-	adds r0, r1
-	ldr r1, _0807B4FC @ =SpriteCallbackDummy
-	str r1, [r0]
-	ldrb r1, [r4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r5
-	strh r7, [r0, 0x2E]
-	ldrh r0, [r6]
-	mov r1, r10
-	muls r1, r0
-	adds r0, r1, 0
-	add r0, r9
-	movs r1, 0xB
-	bl GetMonData
-	ldrb r2, [r4]
-	lsls r1, r2, 4
-	adds r1, r2
-	lsls r1, 2
-	adds r1, r5
-	strh r0, [r1, 0x32]
-	ldrb r1, [r4]
-	lsls r0, r1, 4
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r5
-	ldr r1, _0807B500 @ =gBattleMonForms
-	adds r1, r7, r1
-	ldrb r1, [r1]
-	bl StartSpriteAnim
-_0807B4AC:
-	ldr r1, _0807B4F8 @ =gSprites
-	ldr r0, _0807B4F4 @ =gObjectBankIDs
-	adds r0, r7, r0
-	ldrb r0, [r0]
-	lsls r2, r0, 4
-	adds r2, r0
-	lsls r2, 2
-	adds r2, r1
-	ldr r0, _0807B504 @ =0x02017800
-	ldr r1, [sp]
-	adds r0, r1, r0
-	ldr r1, [r0]
-	lsls r1, 31
-	adds r2, 0x3E
-	lsrs r1, 31
-	lsls r1, 2
-	ldrb r3, [r2]
-	movs r0, 0x5
-	negs r0, r0
-	ands r0, r3
-	orrs r0, r1
-	strb r0, [r2]
-_0807B4D8:
-	add sp, 0x4
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0807B4E8: .4byte gBattlePartyID
-_0807B4EC: .4byte gPlayerParty
-_0807B4F0: .4byte gUnknown_02024E8C
-_0807B4F4: .4byte gObjectBankIDs
-_0807B4F8: .4byte gSprites
-_0807B4FC: .4byte SpriteCallbackDummy
-_0807B500: .4byte gBattleMonForms
-_0807B504: .4byte 0x02017800
-	thumb_func_end sub_807B184
-
-	thumb_func_start sub_807B508
-sub_807B508: @ 807B508
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r5, r0, 24
-	ldr r0, _0807B530 @ =gNoOfAllBanks
-	ldrb r0, [r0]
-	cmp r5, r0
-	bcc _0807B518
-	b _0807B68A
-_0807B518:
-	ldr r2, _0807B534 @ =gBattleTypeFlags
-	ldrh r1, [r2]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _0807B538
-	cmp r5, 0
-	bne _0807B538
-	bl battle_make_oam_safari_battle
-	b _0807B550
-	.align 2, 0
-_0807B530: .4byte gNoOfAllBanks
-_0807B534: .4byte gBattleTypeFlags
-_0807B538:
-	ldrh r1, [r2]
-	movs r0, 0x80
-	lsls r0, 2
-	ands r0, r1
-	cmp r0, 0
-	beq _0807B54A
-	cmp r5, 0
-	bne _0807B54A
-	b _0807B68A
-_0807B54A:
-	adds r0, r5, 0
-	bl battle_make_oam_normal_battle
-_0807B550:
-	lsls r0, 24
-	lsrs r6, r0, 24
-	ldr r0, _0807B58C @ =gHealthboxIDs
-	adds r4, r5, r0
-	strb r6, [r4]
-	adds r0, r5, 0
-	bl sub_8043F44
-	adds r0, r6, 0
-	bl sub_8043DFC
-	adds r0, r5, 0
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	beq _0807B598
-	ldrb r0, [r4]
-	ldr r1, _0807B590 @ =gBattlePartyID
-	lsls r4, r5, 1
-	adds r1, r4, r1
-	ldrh r2, [r1]
-	movs r1, 0x64
-	muls r1, r2
-	ldr r2, _0807B594 @ =gEnemyParty
-	adds r1, r2
-	movs r2, 0
-	bl sub_8045A5C
-	b _0807B5E4
-	.align 2, 0
-_0807B58C: .4byte gHealthboxIDs
-_0807B590: .4byte gBattlePartyID
-_0807B594: .4byte gEnemyParty
-_0807B598:
-	ldr r0, _0807B5C0 @ =gBattleTypeFlags
-	ldrh r1, [r0]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	beq _0807B5CC
-	ldrb r0, [r4]
-	ldr r1, _0807B5C4 @ =gBattlePartyID
-	lsls r4, r5, 1
-	adds r1, r4, r1
-	ldrh r2, [r1]
-	movs r1, 0x64
-	muls r1, r2
-	ldr r2, _0807B5C8 @ =gPlayerParty
-	adds r1, r2
-	movs r2, 0xA
-	bl sub_8045A5C
-	b _0807B5E4
-	.align 2, 0
-_0807B5C0: .4byte gBattleTypeFlags
-_0807B5C4: .4byte gBattlePartyID
-_0807B5C8: .4byte gPlayerParty
-_0807B5CC:
-	ldrb r0, [r4]
-	ldr r1, _0807B610 @ =gBattlePartyID
-	lsls r4, r5, 1
-	adds r1, r4, r1
-	ldrh r2, [r1]
-	movs r1, 0x64
-	muls r1, r2
-	ldr r2, _0807B614 @ =gPlayerParty
-	adds r1, r2
-	movs r2, 0
-	bl sub_8045A5C
-_0807B5E4:
-	adds r0, r5, 0
-	bl GetBankIdentity
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x3
-	beq _0807B600
-	adds r0, r5, 0
-	bl GetBankIdentity
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x2
-	bne _0807B61C
-_0807B600:
-	ldr r0, _0807B618 @ =gHealthboxIDs
-	adds r0, r5, r0
-	ldrb r0, [r0]
-	movs r1, 0x1
-	bl nullsub_11
-	b _0807B628
-	.align 2, 0
-_0807B610: .4byte gBattlePartyID
-_0807B614: .4byte gPlayerParty
-_0807B618: .4byte gHealthboxIDs
-_0807B61C:
-	ldr r0, _0807B654 @ =gHealthboxIDs
-	adds r0, r5, r0
-	ldrb r0, [r0]
-	movs r1, 0
-	bl nullsub_11
-_0807B628:
-	adds r0, r5, 0
-	bl GetBankSide
-	lsls r0, 24
-	cmp r0, 0
-	beq _0807B660
-	ldr r0, _0807B658 @ =gBattlePartyID
-	adds r0, r4, r0
-	ldrh r1, [r0]
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, _0807B65C @ =gEnemyParty
-	adds r0, r1
-	movs r1, 0x39
-	bl GetMonData
-	cmp r0, 0
-	bne _0807B68A
-	adds r0, r6, 0
-	bl sub_8043DB0
-	b _0807B68A
-	.align 2, 0
-_0807B654: .4byte gHealthboxIDs
-_0807B658: .4byte gBattlePartyID
-_0807B65C: .4byte gEnemyParty
-_0807B660:
-	ldr r0, _0807B690 @ =gBattleTypeFlags
-	ldrh r1, [r0]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _0807B68A
-	ldr r0, _0807B694 @ =gBattlePartyID
-	adds r0, r4, r0
-	ldrh r1, [r0]
-	movs r0, 0x64
-	muls r0, r1
-	ldr r1, _0807B698 @ =gPlayerParty
-	adds r0, r1
-	movs r1, 0x39
-	bl GetMonData
-	cmp r0, 0
-	bne _0807B68A
-	adds r0, r6, 0
-	bl sub_8043DB0
-_0807B68A:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.align 2, 0
-_0807B690: .4byte gBattleTypeFlags
-_0807B694: .4byte gBattlePartyID
-_0807B698: .4byte gPlayerParty
-	thumb_func_end sub_807B508
-
-	.align 2, 0 @ Don't pad with nop.
diff --git a/include/battle.h b/include/battle.h
index d948dfa7d..08ed5cf58 100644
--- a/include/battle.h
+++ b/include/battle.h
@@ -520,7 +520,7 @@ struct BattleResults
 
 struct Struct2017800
 {
-    u8 unk0_0:1;
+    u8 invisible:1;
     u8 unk0_1:1;
     u8 substituteSprite:1;
     u8 unk0_3:1;
diff --git a/ld_script.txt b/ld_script.txt
index 28254eba9..3afb9759a 100644
--- a/ld_script.txt
+++ b/ld_script.txt
@@ -121,7 +121,6 @@ SECTIONS {
         src/rom_8077ABC.o(.text);
         src/task.o(.text);
         src/reshow_battle_screen.o(.text);
-        asm/reshow_battle_screen.o(.text);
         src/battle_anim_807B69C.o(.text);
         src/title_screen.o(.text);
         src/field_weather.o(.text);
diff --git a/src/battle_10.c b/src/battle_10.c
index c2053a5d1..1a01e5383 100644
--- a/src/battle_10.c
+++ b/src/battle_10.c
@@ -765,7 +765,7 @@ void sub_8039648(void)
     switch (ewram17810[gActiveBank].unk4)
     {
     case 0:
-        if (ewram17800[gActiveBank].unk0_2)
+        if (ewram17800[gActiveBank].substituteSprite)
             move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 5);
         ewram17810[gActiveBank].unk4 = 1;
         break;
@@ -834,7 +834,7 @@ void sub_803995C(void)
 {
     if (ewram17810[gActiveBank].unk4 == 0)
     {
-        if (ewram17800[gActiveBank].unk0_2)
+        if (ewram17800[gActiveBank].substituteSprite)
             move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 5);
         ewram17810[gActiveBank].unk4++;
     }
@@ -909,7 +909,7 @@ void sub_8039B64(void)
     switch (ewram17810[gActiveBank].unk4)
     {
     case 0:
-        if (ewram17800[gActiveBank].unk0_2 && !ewram17800[gActiveBank].unk0_3)
+        if (ewram17800[gActiveBank].substituteSprite && !ewram17800[gActiveBank].unk0_3)
         {
             ewram17800[gActiveBank].unk0_3 = 1;
             move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 5);
@@ -929,7 +929,7 @@ void sub_8039B64(void)
         if (!gAnimScriptActive)
         {
             sub_80326EC(1);
-            if ((ewram17800[gActiveBank].unk0_2) && r7 <= 1)
+            if ((ewram17800[gActiveBank].substituteSprite) && r7 <= 1)
             {
                 move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 6);
                 ewram17800[gActiveBank].unk0_3 = 0;
diff --git a/src/battle_2.c b/src/battle_2.c
index 7772444d7..bdd908ea5 100644
--- a/src/battle_2.c
+++ b/src/battle_2.c
@@ -1347,8 +1347,8 @@ void sub_8010384(struct Sprite *sprite)
     u16 species;
     u8 yOffset;
 
-    if (ewram17800[r6].unk2 != 0)
-        species = ewram17800[r6].unk2;
+    if (ewram17800[r6].transformedSpecies != 0)
+        species = ewram17800[r6].transformedSpecies;
     else
         species = sprite->data2;
 
diff --git a/src/battle_6.c b/src/battle_6.c
index 6fa0e3948..e7f152a4b 100644
--- a/src/battle_6.c
+++ b/src/battle_6.c
@@ -800,7 +800,7 @@ void sub_802FB2C(void)
     switch (ewram17810[gActiveBank].unk4)
     {
     case 0:
-        if (ewram17800[gActiveBank].unk0_2)
+        if (ewram17800[gActiveBank].substituteSprite)
             move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 5);
         ewram17810[gActiveBank].unk4 = 1;
         break;
@@ -875,7 +875,7 @@ void sub_802FE7C(void)
 {
     if (ewram17810[gActiveBank].unk4 == 0)
     {
-        if (ewram17800[gActiveBank].unk0_2)
+        if (ewram17800[gActiveBank].substituteSprite)
             move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 5);
         ewram17810[gActiveBank].unk4++;
     }
@@ -963,7 +963,7 @@ void sub_8030190(void)
     switch (ewram17810[gActiveBank].unk4)
     {
     case 0:
-        if (ewram17800[gActiveBank].unk0_2 == 1 && ewram17800[gActiveBank].unk0_3 == 0)
+        if (ewram17800[gActiveBank].substituteSprite == 1 && ewram17800[gActiveBank].unk0_3 == 0)
         {
             ewram17800[gActiveBank].unk0_3 = 1;
             move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 5);
@@ -983,7 +983,7 @@ void sub_8030190(void)
         if (!gAnimScriptActive)
         {
             sub_80326EC(1);
-            if (ewram17800[gActiveBank].unk0_2 == 1 && r7 < 2)
+            if (ewram17800[gActiveBank].substituteSprite == 1 && r7 < 2)
             {
                 move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 6);
                 ewram17800[gActiveBank].unk0_3 = 0;
diff --git a/src/battle_7.c b/src/battle_7.c
index 8c5f5f45d..0c4b118b4 100644
--- a/src/battle_7.c
+++ b/src/battle_7.c
@@ -607,12 +607,12 @@ void sub_8031F24(void)
     s32 i;
 
     for (i = 0; i < gNoOfAllBanks; i++)
-        ewram17800[i].unk0_0 = gSprites[gObjectBankIDs[i]].invisible;
+        ewram17800[i].invisible = gSprites[gObjectBankIDs[i]].invisible;
 }
 
 void sub_8031F88(u8 a)
 {
-    ewram17800[a].unk0_0 = gSprites[gObjectBankIDs[a]].invisible;
+    ewram17800[a].invisible = gSprites[gObjectBankIDs[a]].invisible;
 }
 
 void sub_8031FC4(u8 bank1, u8 bank2, bool8 c)
diff --git a/src/battle_8.c b/src/battle_8.c
index 6d17ecd28..44e42d0d6 100644
--- a/src/battle_8.c
+++ b/src/battle_8.c
@@ -785,7 +785,7 @@ void sub_8034B74(void)
     switch (ewram17810[gActiveBank].unk4)
     {
     case 0:
-        if (ewram17800[gActiveBank].unk0_2)
+        if (ewram17800[gActiveBank].substituteSprite)
             move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 5);
         ewram17810[gActiveBank].unk4 = 1;
         break;
@@ -876,7 +876,7 @@ void sub_8035030(void)
 {
     if (ewram17810[gActiveBank].unk4 == 0)
     {
-        if (ewram17800[gActiveBank].unk0_2)
+        if (ewram17800[gActiveBank].substituteSprite)
             move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 5);
         ewram17810[gActiveBank].unk4++;
     }
@@ -951,7 +951,7 @@ void sub_8035238(void)
     switch (ewram17810[gActiveBank].unk4)
     {
     case 0:
-        if (ewram17800[gActiveBank].unk0_2 && !ewram17800[gActiveBank].unk0_3)
+        if (ewram17800[gActiveBank].substituteSprite && !ewram17800[gActiveBank].unk0_3)
         {
             ewram17800[gActiveBank].unk0_3 = 1;
             move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 5);
@@ -971,7 +971,7 @@ void sub_8035238(void)
         if (!gAnimScriptActive)
         {
             sub_80326EC(1);
-            if ((ewram17800[gActiveBank].unk0_2) && r7 <= 1)
+            if ((ewram17800[gActiveBank].substituteSprite) && r7 <= 1)
             {
                 move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 6);
                 ewram17800[gActiveBank].unk0_3 = 0;
diff --git a/src/battle_811DA74.c b/src/battle_811DA74.c
index 47ae8246f..14f547b82 100644
--- a/src/battle_811DA74.c
+++ b/src/battle_811DA74.c
@@ -298,7 +298,7 @@ void sub_811E034(void)
 {
     if (gSprites[gHealthboxIDs[gActiveBank]].callback == SpriteCallbackDummy)
     {
-        if (ewram17800[gActiveBank].unk0_2)
+        if (ewram17800[gActiveBank].substituteSprite)
             move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 6);
         gBattleBankFunc[gActiveBank] = sub_811E0A0;
     }
@@ -1059,7 +1059,7 @@ void sub_811FA5C(void)
     switch (ewram17810[gActiveBank].unk4)
     {
     case 0:
-        if (ewram17800[gActiveBank].unk0_2)
+        if (ewram17800[gActiveBank].substituteSprite)
             move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 5);
         ewram17810[gActiveBank].unk4 = 1;
         break;
@@ -1125,7 +1125,7 @@ void sub_811FCE8(void)
 {
     if (ewram17810[gActiveBank].unk4 == 0)
     {
-        if (ewram17800[gActiveBank].unk0_2)
+        if (ewram17800[gActiveBank].substituteSprite)
             move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 5);
         ewram17810[gActiveBank].unk4++;
     }
@@ -1200,7 +1200,7 @@ void sub_811FF30(void)
     switch (ewram17810[gActiveBank].unk4)
     {
     case 0:
-        if (ewram17800[gActiveBank].unk0_2 && !ewram17800[gActiveBank].unk0_3)
+        if (ewram17800[gActiveBank].substituteSprite && !ewram17800[gActiveBank].unk0_3)
         {
             ewram17800[gActiveBank].unk0_3 = 1;
             move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 5);
@@ -1220,7 +1220,7 @@ void sub_811FF30(void)
         if (!gAnimScriptActive)
         {
             sub_80326EC(1);
-            if ((ewram17800[gActiveBank].unk0_2) && r7 <= 1)
+            if ((ewram17800[gActiveBank].substituteSprite) && r7 <= 1)
             {
                 move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 6);
                 ewram17800[gActiveBank].unk0_3 = 0;
diff --git a/src/battle_anim_8137220.c b/src/battle_anim_8137220.c
index 8d323736a..af2b86c17 100644
--- a/src/battle_anim_8137220.c
+++ b/src/battle_anim_8137220.c
@@ -1081,7 +1081,7 @@ void sub_81390D0(void)
     switch (ewram17810[gActiveBank].unk4)
     {
     case 0:
-        if (ewram17800[gActiveBank].unk0_2 == 1)
+        if (ewram17800[gActiveBank].substituteSprite == 1)
             move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 5);
         ewram17810[gActiveBank].unk4 = 1;
         break;
@@ -1098,7 +1098,7 @@ void sub_81390D0(void)
         if (!gAnimScriptActive)
         {
             sub_80326EC(1);
-            if (ewram17800[gActiveBank].unk0_2 == 1)
+            if (ewram17800[gActiveBank].substituteSprite == 1)
                 move_anim_start_t4(gActiveBank, gActiveBank, gActiveBank, 6);
             ewram17810[gActiveBank].unk4 = 3;
         }
@@ -1382,7 +1382,7 @@ void sub_81398BC(u8 bank)
 {
     u16 species;
 
-    ewram17800[bank].unk2 = 0;
+    ewram17800[bank].transformedSpecies = 0;
     gBattlePartyID[bank] = gBattleBufferA[bank][1];
     species = GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
     gUnknown_0300434C[bank] = CreateInvisibleSpriteWithCallback(sub_80312F0);
diff --git a/src/reshow_battle_screen.c b/src/reshow_battle_screen.c
index 6643ba4b2..1ed5da7d3 100644
--- a/src/reshow_battle_screen.c
+++ b/src/reshow_battle_screen.c
@@ -5,7 +5,9 @@
 #include "unknown_task.h"
 #include "text.h"
 #include "rom_8077ABC.h"
+#include "data2.h"
 
+extern struct SpriteTemplate gUnknown_02024E8C;
 extern struct Window gUnknown_03004210;
 extern u16 gUnknown_03004280;
 extern u16 gUnknown_03004288;
@@ -22,6 +24,8 @@ extern u16 gBattlePartyID[4];
 extern u8 gNoOfAllBanks;
 extern u16 gBattleTypeFlags;
 extern u8 gObjectBankIDs[4];
+extern u8 gBattleMonForms[4];
+extern u8 gHealthboxIDs[4];
 
 bool8 sub_800E414(u8 a0);
 bool8 sub_8031C30(u8 a0);
@@ -35,6 +39,13 @@ void BattleLoadSubstituteSprite(u8 bank, u8 b);
 void LoadPlayerTrainerBankSprite(u16 a0, u8 bank);
 u8 sub_8077F7C(u8 bank);
 u8 sub_8077F68(u8 bank);
+void nullsub_11(u8 healthboxID, u8 a1);
+void sub_8043DB0(u8 bank);
+u8 battle_make_oam_normal_battle(u8 bank);
+u8 battle_make_oam_safari_battle(void);
+void sub_8045A5C(u8 healthboxID, struct Pokemon*, u8);
+void sub_8043F44(u8 bank);
+void sub_8043DFC(u8 healthboxID);
 
 // this file's functions
 static void CB2_ReshowBattleScreenAfterMenu(void);
@@ -239,24 +250,93 @@ void sub_807B184(u8 bank)
 {
     if (bank < gNoOfAllBanks)
     {
-        u16 species;
-        s16 posX, posY;
-        u8 subpriority;
+        u8 posY;
 
         if (ewram17800[bank].substituteSprite)
-            posY = sub_8077F7C();
+            posY = sub_8077F7C(bank);
         else
-            posY = sub_8077F68();
+            posY = sub_8077F68(bank);
         if (GetBankSide(bank))
         {
-            if (GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_HP))
-            {
-                species = GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
-                GetMonSpriteTemplate_803C56C(species, GetBankIdentity(bank));
-                posX = sub_8077ABC(bank);
-                subpriority = sub_8079E90(bank);
-                gObjectBankIDs[] = todo;
-            }
+            if (GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_HP) == 0)
+                return;
+            GetMonSpriteTemplate_803C56C(GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_SPECIES), GetBankIdentity(bank));
+            gObjectBankIDs[bank] = CreateSprite(&gUnknown_02024E8C, sub_8077ABC(bank, 2), posY, sub_8079E90(bank));
+            gSprites[gObjectBankIDs[bank]].oam.paletteNum = bank;
+            gSprites[gObjectBankIDs[bank]].callback = SpriteCallbackDummy;
+            gSprites[gObjectBankIDs[bank]].data0 = bank;
+            gSprites[gObjectBankIDs[bank]].data2 = GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
+            StartSpriteAnim(&gSprites[gObjectBankIDs[bank]], gBattleMonForms[bank]);
+        }
+        else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI && bank == 0)
+        {
+            GetMonSpriteTemplate_803C5A0(gSaveBlock2.playerGender, GetBankIdentity(0));
+            gObjectBankIDs[bank] = CreateSprite(&gUnknown_02024E8C, 0x50,
+                                                (8 - gTrainerBackPicCoords[gSaveBlock2.playerGender].coords) * 4 + 80,
+                                                 sub_8079E90(0));
+            gSprites[gObjectBankIDs[bank]].oam.paletteNum = bank;
+            gSprites[gObjectBankIDs[bank]].callback = SpriteCallbackDummy;
+            gSprites[gObjectBankIDs[bank]].data0 = bank;
+        }
+        else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL && bank == 0)
+        {
+            GetMonSpriteTemplate_803C5A0(2, GetBankIdentity(0));
+            gObjectBankIDs[bank] = CreateSprite(&gUnknown_02024E8C, 0x50,
+                                                (8 - gTrainerBackPicCoords[2].coords) * 4 + 80,
+                                                 sub_8079E90(0));
+            gSprites[gObjectBankIDs[bank]].oam.paletteNum = bank;
+            gSprites[gObjectBankIDs[bank]].callback = SpriteCallbackDummy;
+            gSprites[gObjectBankIDs[bank]].data0 = bank;
+        }
+        else
+        {
+            if (GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_HP) == 0)
+                return;
+            GetMonSpriteTemplate_803C56C(GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES), GetBankIdentity(bank));
+            gObjectBankIDs[bank] = CreateSprite(&gUnknown_02024E8C, sub_8077ABC(bank, 2), posY, sub_8079E90(bank));
+            gSprites[gObjectBankIDs[bank]].oam.paletteNum = bank;
+            gSprites[gObjectBankIDs[bank]].callback = SpriteCallbackDummy;
+            gSprites[gObjectBankIDs[bank]].data0 = bank;
+            gSprites[gObjectBankIDs[bank]].data2 = GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_SPECIES);
+            StartSpriteAnim(&gSprites[gObjectBankIDs[bank]], gBattleMonForms[bank]);
+        }
+        gSprites[gObjectBankIDs[bank]].invisible = ewram17800[bank].invisible;
+    }
+}
+
+void sub_807B508(u8 bank)
+{
+    if (bank < gNoOfAllBanks)
+    {
+        u8 healthboxID;
+        if (gBattleTypeFlags & BATTLE_TYPE_SAFARI && bank == 0)
+            healthboxID = battle_make_oam_safari_battle();
+        else if (gBattleTypeFlags & BATTLE_TYPE_WALLY_TUTORIAL && bank == 0)
+            return;
+        else
+            healthboxID = battle_make_oam_normal_battle(bank);
+        gHealthboxIDs[bank] = healthboxID;
+        sub_8043F44(bank);
+        sub_8043DFC(healthboxID);
+        if (GetBankSide(bank))
+            sub_8045A5C(gHealthboxIDs[bank], &gEnemyParty[gBattlePartyID[bank]], 0);
+        else if (gBattleTypeFlags & BATTLE_TYPE_SAFARI)
+            sub_8045A5C(gHealthboxIDs[bank], &gPlayerParty[gBattlePartyID[bank]], 10);
+        else
+            sub_8045A5C(gHealthboxIDs[bank], &gPlayerParty[gBattlePartyID[bank]], 0);
+        if (GetBankIdentity(bank) == 3 || GetBankIdentity(bank) == 2)
+            nullsub_11(gHealthboxIDs[bank], 1);
+        else
+            nullsub_11(gHealthboxIDs[bank], 0);
+        if (GetBankSide(bank))
+        {
+            if (GetMonData(&gEnemyParty[gBattlePartyID[bank]], MON_DATA_HP) == 0)
+                sub_8043DB0(healthboxID);
+        }
+        else if (!(gBattleTypeFlags & BATTLE_TYPE_SAFARI))
+        {
+            if (GetMonData(&gPlayerParty[gBattlePartyID[bank]], MON_DATA_HP) == 0)
+                sub_8043DB0(healthboxID);
         }
     }
 }