Merge branch 'master' into continue_union_room

3 files changed, 27 insertions, 349 deletions

diff --git a/data/battle_scripts_1.s b/data/battle_scripts_1.s
index ae0e36be1..a3ba7eb08 100644
--- a/data/battle_scripts_1.s
+++ b/data/battle_scripts_1.s
@@ -284,8 +284,7 @@ BattleScript_HitFromAtkAnimation::
 	seteffectwithchance
 	tryfaintmon BS_TARGET, FALSE, NULL
 BattleScript_MoveEnd::
-	setbyte sMOVEEND_STATE, 0x0
-	moveend 0x0, 0x0
+	moveendall
 	end
 
 BattleScript_MakeMoveMissed::
@@ -423,8 +422,7 @@ BattleScript_ExplosionLoop:
 	resultmessage
 	waitmessage 0x40
 	tryfaintmon BS_TARGET, FALSE, NULL
-	setbyte sMOVEEND_STATE, 0x0
-	moveend 0x2, 0x10
+	moveendto ATK49_NEXT_TARGET
 	jumpifnexttargetvalid BattleScript_ExplosionLoop
 	tryfaintmon BS_ATTACKER, FALSE, NULL
 	end
@@ -432,8 +430,7 @@ BattleScript_ExplosionMissed:
 	effectivenesssound
 	resultmessage
 	waitmessage 0x40
-	setbyte sMOVEEND_STATE, 0x0
-	moveend 0x2, 0x10
+	moveendto ATK49_NEXT_TARGET
 	jumpifnexttargetvalid BattleScript_ExplosionLoop
 	tryfaintmon BS_ATTACKER, FALSE, NULL
 	end
@@ -657,8 +654,7 @@ BattleScript_DoMultiHit::
 	printstring STRINGID_EMPTYSTRING3
 	waitmessage 0x1
 	addbyte sMULTIHIT_STRING + 4, 0x1
-	setbyte sMOVEEND_STATE, 0x0
-	moveend 0x2, 0x10
+	moveendto ATK49_NEXT_TARGET
 	jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_FOE_ENDURED, BattleScript_MultiHitPrintStrings
 	decrementmultihit BattleScript_MultiHitLoop
 	goto BattleScript_MultiHitPrintStrings
@@ -674,10 +670,8 @@ BattleScript_MultiHitPrintStrings::
 BattleScript_MultiHitEnd::
 	seteffectwithchance
 	tryfaintmon BS_TARGET, FALSE, NULL
-	setbyte sMOVEEND_STATE, 0x2
-	moveend 0x1, 0x0
-	setbyte sMOVEEND_STATE, 0x4
-	moveend 0x0, 0x0
+	moveendcase ATK49_SYNCHRONIZE_TARGET
+	moveendfrom ATK49_STATUS_IMMUNITY_ABILITIES
 	end
 
 BattleScript_EffectConversion::
@@ -1441,8 +1435,7 @@ BattleScript_DoTripleKickAttack::
 	waitmessage 0x40
 	printstring STRINGID_EMPTYSTRING3
 	waitmessage 0x1
-	setbyte sMOVEEND_STATE, 0x0
-	moveend 0x2, 0x10
+	moveendto ATK49_NEXT_TARGET
 	jumpifbyte CMP_COMMON_BITS, gMoveResultFlags, MOVE_RESULT_FOE_ENDURED, BattleScript_TripleKickPrintStrings
 	decrementmultihit BattleScript_TripleKickLoop
 	goto BattleScript_TripleKickPrintStrings
@@ -1461,8 +1454,7 @@ BattleScript_TripleKickPrintStrings::
 BattleScript_TripleKickEnd::
 	seteffectwithchance
 	tryfaintmon BS_TARGET, FALSE, NULL
-	setbyte sMOVEEND_STATE, 0xE
-	moveend 0x0, 0x0
+	moveendfrom ATK49_UPDATE_LAST_MOVES
 	end
 
 BattleScript_EffectThief::
@@ -1893,8 +1885,7 @@ BattleScript_DoHitAllWithUndergroundBonus::
 	printstring STRINGID_EMPTYSTRING3
 	waitmessage 0x1
 	tryfaintmon BS_TARGET, FALSE, NULL
-	setbyte sMOVEEND_STATE, 0x0
-	moveend 0x2, 0x10
+	moveendto ATK49_NEXT_TARGET
 	jumpifnexttargetvalid BattleScript_HitsAllWithUndergroundBonusLoop
 	end
 BattleScript_HitAllWithUndergroundBonusMissed::
@@ -1903,8 +1894,7 @@ BattleScript_HitAllWithUndergroundBonusMissed::
 	effectivenesssound
 	resultmessage
 	waitmessage 0x40
-	setbyte sMOVEEND_STATE, 0x0
-	moveend 0x2, 0x10
+	moveendto ATK49_NEXT_TARGET
 	jumpifnexttargetvalid BattleScript_HitsAllWithUndergroundBonusLoop
 	end
 
@@ -1995,8 +1985,7 @@ BattleScript_BeatUpAttack::
 	resultmessage
 	waitmessage 0x40
 	tryfaintmon BS_TARGET, FALSE, NULL
-	setbyte sMOVEEND_STATE, 0x0
-	moveend 0x2, 0x10
+	moveendto ATK49_NEXT_TARGET
 	goto BattleScript_BeatUpLoop
 BattleScript_BeatUpEnd::
 	end
@@ -2617,8 +2606,7 @@ BattleScript_TeeterDanceLoop::
 	resultmessage
 	waitmessage 0x40
 BattleScript_TeeterDanceDoMoveEndIncrement::
-	setbyte sMOVEEND_STATE, 0x0
-	moveend 0x2, 0x10
+	moveendto ATK49_NEXT_TARGET
 BattleScript_TeeterDanceLoopIncrement::
 	addbyte gBattlerTarget, 0x1
 	jumpifbytenotequal gBattlerTarget, gBattlersCount, BattleScript_TeeterDanceLoop
@@ -3140,10 +3128,8 @@ BattleScript_DoSwitchOut::
 	switchinanim BS_ATTACKER, FALSE
 	waitstate
 	switchineffects BS_ATTACKER
-	setbyte sMOVEEND_STATE, 0x4
-	moveend 0x1, 0x0
-	setbyte sMOVEEND_STATE, 0xF
-	moveend 0x1, 0x0
+	moveendcase ATK49_STATUS_IMMUNITY_ABILITIES
+	moveendcase ATK49_MIRROR_MOVE
 	end2
 
 BattleScript_PursuitDmgOnSwitchOut::
@@ -3166,8 +3152,7 @@ BattleScript_PursuitDmgOnSwitchOut::
 	resultmessage
 	waitmessage 0x40
 	tryfaintmon BS_TARGET, FALSE, NULL
-	setbyte sMOVEEND_STATE, 0x3
-	moveend 0x2, 0x6
+	moveendfromto ATK49_MOVE_END_ABILITIES, ATK49_CHOICE_MOVE
 	various4 BS_TARGET
 	jumpifbyte CMP_EQUAL, gBattleCommunication, 0x0, BattleScript_PursuitDmgOnSwitchOutRet
 	setbyte sGIVEEXP_STATE, 0x0
@@ -3395,8 +3380,7 @@ BattleScript_DisabledNoMore::
 BattleScript_SelectingDisabledMoveInPalace::
 	printstring STRINGID_PKMNMOVEISDISABLED
 BattleScript_SelectingUnusableMoveInPalace::
-	setbyte sMOVEEND_STATE, 0x0
-	moveend 0x2, 0x10
+	moveendto ATK49_NEXT_TARGET
 	end
 
 BattleScript_EncoredNoMore::
@@ -3425,8 +3409,7 @@ BattleScript_SpikesOnAttacker::
 BattleScript_SpikesOnAttackerFainted::
 	setbyte sGIVEEXP_STATE, 0x0
 	getexp BS_ATTACKER
-	setbyte sMOVEEND_STATE, 0x0
-	moveend 0x0, 0x0
+	moveendall
 	goto BattleScript_HandleFaintedMon
 
 BattleScript_SpikesOnTarget::
@@ -3441,8 +3424,7 @@ BattleScript_SpikesOnTarget::
 BattleScript_SpikesOnTargetFainted::
 	setbyte sGIVEEXP_STATE, 0x0
 	getexp BS_TARGET
-	setbyte sMOVEEND_STATE, 0x0
-	moveend 0x0, 0x0
+	moveendall
 	goto BattleScript_HandleFaintedMon
 
 BattleScript_SpikesOnFaintedBattler::
@@ -3457,8 +3439,7 @@ BattleScript_SpikesOnFaintedBattler::
 BattleScript_SpikesOnFaintedBattlerFainted::
 	setbyte sGIVEEXP_STATE, 0x0
 	getexp BS_FAINTED
-	setbyte sMOVEEND_STATE, 0x0
-	moveend 0x0, 0x0
+	moveendall
 	goto BattleScript_HandleFaintedMon
 
 BattleScript_PrintHurtBySpikes::
@@ -3562,10 +3543,8 @@ BattleScript_DoFutureAttackHit::
 	tryfaintmon BS_TARGET, FALSE, NULL
 	atk24 BattleScript_FutureAttackEnd
 BattleScript_FutureAttackEnd::
-	setbyte sMOVEEND_STATE, 0x0
-	moveend 0x1, 0x0
-	setbyte sMOVEEND_STATE, 0xB
-	moveend 0x2, 0xE
+	moveendcase ATK49_RAGE
+	moveendfromto ATK49_ITEM_EFFECTS_ALL, ATK49_UPDATE_LAST_MOVES
 	setbyte gMoveResultFlags, 0
 	end2
 
@@ -4254,8 +4233,7 @@ BattleScript_AbilityCuredStatus::
 BattleScript_IgnoresWhileAsleep::
 	printstring STRINGID_PKMNIGNORESASLEEP
 	waitmessage 0x40
-	setbyte sMOVEEND_STATE, 0x0
-	moveend 0x2, 0x10
+	moveendto ATK49_NEXT_TARGET
 	end
 
 BattleScript_IgnoresAndUsesRandomMove::
@@ -4271,8 +4249,7 @@ BattleScript_MoveUsedLoafingAround::
 BattleScript_82DB6C7::
 	printfromtable gInobedientStringIds
 	waitmessage 0x40
-	setbyte sMOVEEND_STATE, 0x0
-	moveend 0x2, 0x10
+	moveendto ATK49_NEXT_TARGET
 	end
 
 BattleScript_IgnoresAndFallsAsleep::
@@ -4280,8 +4257,7 @@ BattleScript_IgnoresAndFallsAsleep::
 	waitmessage 0x40
 	setmoveeffect MOVE_EFFECT_SLEEP | MOVE_EFFECT_AFFECTS_USER
 	seteffectprimary
-	setbyte sMOVEEND_STATE, 0x0
-	moveend 0x2, 0x10
+	moveendto ATK49_NEXT_TARGET
 	end
 
 BattleScript_IgnoresAndHitsItself::
diff --git a/data/mevent_801BAAC.s b/data/mevent_801BAAC.s
deleted file mode 100755
index 37c1ae46f..000000000
--- a/data/mevent_801BAAC.s
+++ /dev/null
@@ -1,254 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gUnknown_082F0E10:: @ 82F0E10
-	.byte 0x00, 0x02, 0x03
-	.byte 0x00, 0x01, 0x02
-
-	.align 2
-gUnknown_082F0E18:: @ 82F0E18
-	.byte 0x07, 0x04, 0x07, 0x00
-
-	.align 2
-gUnknown_082F0E1C:: @ 82F0E1C
-	window_template 0x01, 0x01, 0x01, 0x19, 0x04, 0x02, 0x029C
-	window_template 0x01, 0x01, 0x06, 0x1C, 0x08, 0x02, 0x01BC
-	window_template 0x01, 0x01, 0x0E, 0x1C, 0x05, 0x02, 0x0130
-
-	.align 2
-gWonderCardBgPal1:: @ 82F0E34
-	.incbin "graphics/wonder_transfers/wonder_card_1.gbapal"
-
-	.align 2
-gWonderCardBgPal2:: @ 82F0E54
-	.incbin "graphics/wonder_transfers/wonder_card_2.gbapal"
-
-	.align 2
-gWonderCardBgPal3:: @ 82F0E74
-	.incbin "graphics/wonder_transfers/wonder_card_3.gbapal"
-
-	.align 2
-gWonderCardBgPal4:: @ 82F0E94
-	.incbin "graphics/wonder_transfers/wonder_card_4.gbapal"
-
-	.align 2
-gWonderCardBgPal5:: @ 82F0EB4
-	.incbin "graphics/wonder_transfers/wonder_card_5.gbapal"
-
-	.align 2
-gWonderCardBgPal6:: @ 82F0ED4
-	.incbin "graphics/wonder_transfers/wonder_card_6.gbapal"
-
-	.align 2
-gWonderCardBgPal7:: @ 82F0EF4
-	.incbin "graphics/wonder_transfers/wonder_card_7.gbapal"
-
-	.align 2
-gWonderCardBgPal8:: @ 82F0F14
-	.incbin "graphics/wonder_transfers/wonder_card_8.gbapal"
-
-	.align 2
-gWonderCardBgGfx1:: @ 82F0F34
-	.incbin "graphics/wonder_transfers/wonder_card_1.4bpp.lz"
-
-	.align 2
-gWonderCardBgTilemap1:: @ 82F1030
-	.incbin "graphics/wonder_transfers/wonder_card_1.bin.lz"
-
-	.align 2
-gWonderCardBgGfx2:: @ 82F1124
-	.incbin "graphics/wonder_transfers/wonder_card_2.4bpp.lz"
-
-	.align 2
-gWonderCardBgTilemap2:: @ 82F1218
-	.incbin "graphics/wonder_transfers/wonder_card_2.bin.lz"
-
-	.align 2
-gWonderCardBgGfx3:: @ 82F1300
-	.incbin "graphics/wonder_transfers/wonder_card_3.4bpp.lz"
-
-	.align 2
-gWonderCardBgTilemap3:: @ 82F13D4
-	.incbin "graphics/wonder_transfers/wonder_card_3.bin.lz"
-
-	.align 2
-gWonderCardBgGfx7:: @ 82F14A8
-	.incbin "graphics/wonder_transfers/wonder_card_7.4bpp.lz"
-
-	.align 2
-gWonderCardBgTilemap7:: @ 82F16DC
-	.incbin "graphics/wonder_transfers/wonder_card_7.bin.lz"
-
-	.align 2
-gWonderCardBgGfx8:: @ 82F1824
-	.incbin "graphics/wonder_transfers/wonder_card_8.4bpp.lz"
-
-	.align 2
-gWonderCardBgTilemap8:: @ 82F1A54
-	.incbin "graphics/wonder_transfers/wonder_card_8.bin.lz"
-
-	.align 2
-gWonderCardShadowPal1:: @ 82F1B9C
-	.incbin "graphics/wonder_transfers/wonder_card_shadow_1.gbapal"
-
-	.align 2
-gWonderCardShadowPal2:: @ 82F1BBC
-	.incbin "graphics/wonder_transfers/wonder_card_shadow_2.gbapal"
-
-	.align 2
-gWonderCardShadowPal3:: @ 82F1BDC
-	.incbin "graphics/wonder_transfers/wonder_card_shadow_3.gbapal"
-
-	.align 2
-gWonderCardShadowPal4:: @ 82F1BFC
-	.incbin "graphics/wonder_transfers/wonder_card_shadow_4.gbapal"
-
-	.align 2
-gWonderCardShadowPal5:: @ 82F1C1C
-	.incbin "graphics/wonder_transfers/wonder_card_shadow_5.gbapal"
-
-	.align 2
-gWonderCardShadowPal6:: @ 82F1C3C
-	.incbin "graphics/wonder_transfers/wonder_card_shadow_6.gbapal"
-
-	.align 2
-gWonderCardShadowPal7:: @ 82F1C5C
-	.incbin "graphics/wonder_transfers/wonder_card_shadow_7.gbapal"
-
-	.align 2
-gWonderCardShadowPal8:: @ 82F1C7C
-	.incbin "graphics/wonder_transfers/wonder_card_shadow_8.gbapal"
-
-	.align 2
-gWonderCardShadowGfx:: @ 82F1C9C
-	.incbin "graphics/wonder_transfers/wonder_card_shadow.4bpp.lz"
-
-	.align 2
-gUnknown_082F1D00:: @ 82F1D00 struct CompressedSpriteSheet
-	.4byte gWonderCardShadowGfx
-	.2byte 0x0100
-	.2byte 0x8000
-
-	.align 2
-gUnknown_082F1D08:: @ 82F1D08 struct SpritePalette
-	.4byte gWonderCardShadowPal1
-	.2byte 0x8000
-
-	.align 2
-	.4byte gWonderCardShadowPal2
-	.2byte 0x8000
-
-	.align 2
-	.4byte gWonderCardShadowPal3
-	.2byte 0x8000
-
-	.align 2
-	.4byte gWonderCardShadowPal4
-	.2byte 0x8000
-
-	.align 2
-	.4byte gWonderCardShadowPal5
-	.2byte 0x8000
-
-	.align 2
-	.4byte gWonderCardShadowPal6
-	.2byte 0x8000
-
-	.align 2
-	.4byte gWonderCardShadowPal7
-	.2byte 0x8000
-
-	.align 2
-	.4byte gWonderCardShadowPal8
-	.2byte 0x8000
-
-	.align 2
-gUnknown_082F1D48:: @ 82F1D48
-	spr_template 0x8000, 0x8000, gUnknown_08524934, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gUnknown_082F1D60:: @ 82F1D60
-	.4byte 0x00000001, gWonderCardBgGfx1, gWonderCardBgTilemap1, gWonderCardBgPal1
-	.4byte 0x00001001, gWonderCardBgGfx2, gWonderCardBgTilemap2, gWonderCardBgPal2
-	.4byte 0x00002001, gWonderCardBgGfx3, gWonderCardBgTilemap3, gWonderCardBgPal3
-	.4byte 0x00003001, gWonderCardBgGfx3, gWonderCardBgTilemap3, gWonderCardBgPal4
-	.4byte 0x00004001, gWonderCardBgGfx3, gWonderCardBgTilemap3, gWonderCardBgPal5
-	.4byte 0x00005001, gWonderCardBgGfx3, gWonderCardBgTilemap3, gWonderCardBgPal6
-	.4byte 0x00006001, gWonderCardBgGfx7, gWonderCardBgTilemap7, gWonderCardBgPal7
-	.4byte 0x00007001, gWonderCardBgGfx8, gWonderCardBgTilemap8, gWonderCardBgPal8
-
-gUnknown_082F1DE0:: @ 82F1DE0
-	.byte 0x00, 0x02, 0x03, 0x00, 0x01, 0x02, 0x00, 0x00
-
-gUnknown_082F1DE8:: @ 82F1DE8
-	window_template 0x00, 0x01, 0x00, 0x1C, 0x03, 0x02, 0x02AC
-	window_template 0x02, 0x01, 0x03, 0x1C, 0x14, 0x02, 0x007C
-
-gUnknown_082F1DF8:: @ 82F1DF8
-	.4byte 0x0318e802, 0x000098e8, 0x10000002, 0x00001000
-
-	.align 2
-gWonderNewsPal1:: @ 82F1E08
-	.incbin "graphics/wonder_transfers/wonder_news_1.gbapal"
-
-	.align 2
-gWonderNewsPal7:: @ 82F1E28
-	.incbin "graphics/wonder_transfers/wonder_news_7.gbapal"
-
-	.align 2
-gWonderNewsPal8:: @ 82F1E48
-	.incbin "graphics/wonder_transfers/wonder_news_8.gbapal"
-
-	.align 2
-gWonderNewsGfx1:: @ 82F1E68
-	.incbin "graphics/wonder_transfers/wonder_news_1.4bpp.lz"
-
-	.align 2
-gWonderNewsTilemap1:: @ 82F1EE8
-	.incbin "graphics/wonder_transfers/wonder_news_1.bin.lz"
-
-	.align 2
-gWonderNewsGfx2:: @ 82F1FC4
-	.incbin "graphics/wonder_transfers/wonder_news_2.4bpp.lz"
-
-	.align 2
-gWonderNewsTilemap2:: @ 82F1FF4
-	.incbin "graphics/wonder_transfers/wonder_news_2.bin.lz"
-
-	.align 2
-gWonderNewsGfx3:: @ 82F20B4
-	.incbin "graphics/wonder_transfers/wonder_news_3.4bpp.lz"
-
-	.align 2
-gWonderNewsTilemap3:: @ 82F2124
-	.incbin "graphics/wonder_transfers/wonder_news_3.bin.lz"
-
-	.align 2
-gWonderNewsGfx7:: @ 82F21F0
-	.incbin "graphics/wonder_transfers/wonder_news_7.4bpp.lz"
-
-	.align 2
-gWonderNewsTilemap7:: @ 82F2280
-	.incbin "graphics/wonder_transfers/wonder_news_7.bin.lz"
-
-	.align 2
-gWonderNewsGfx8:: @ 82F235C
-	.incbin "graphics/wonder_transfers/wonder_news_8.4bpp.lz"
-
-	.align 2
-gWonderNewsTilemap8:: @ 82F23EC
-	.incbin "graphics/wonder_transfers/wonder_news_8.bin.lz"
-
-	.align 2
-gUnknown_082F24C8:: @ 82F24C8
-	.4byte 0x00000001, gWonderNewsGfx1, gWonderNewsTilemap1, gWonderNewsPal1
-	.4byte 0x00000001, gWonderNewsGfx2, gWonderNewsTilemap2, gWonderCardBgPal2
-	.4byte 0x00000001, gWonderNewsGfx3, gWonderNewsTilemap3, gWonderCardBgPal3
-	.4byte 0x00000001, gWonderNewsGfx3, gWonderNewsTilemap3, gWonderCardBgPal4
-	.4byte 0x00000001, gWonderNewsGfx3, gWonderNewsTilemap3, gWonderCardBgPal5
-	.4byte 0x00000001, gWonderNewsGfx3, gWonderNewsTilemap3, gWonderCardBgPal6
-	.4byte 0x00000001, gWonderNewsGfx7, gWonderNewsTilemap7, gWonderNewsPal7
-	.4byte 0x00000001, gWonderNewsGfx8, gWonderNewsTilemap8, gWonderNewsPal8
diff --git a/data/union_room_chat.s b/data/union_room_chat.s
index 41ca06d9a..143678cd4 100755
--- a/data/union_room_chat.s
+++ b/data/union_room_chat.s
@@ -4,23 +4,6 @@
 	.section .rodata
 
 	.align 2
-gUnknown_082F2A7C:: @ 82F2A7C
-	.4byte sub_801DFAC
-	.4byte sub_801E030
-	.4byte sub_801E120
-	.4byte sub_801E240
-	.4byte sub_801E764
-	.4byte sub_801E838
-	.4byte sub_801E460
-	.4byte sub_801E5C4
-	.4byte sub_801E668
-	.4byte sub_801E978
-
-	.align 2
-gUnknown_082F2AA4:: @ 82F2AA4
-	.byte 0x09, 0x09, 0x09, 0x09
-
-	.align 2
 gUnknown_082F2AA8:: @ 82F2AA8
 	.byte 0x00, 0x16, 0x17, 0x68, 0x19, 0x1a, 0x1b, 0x1c
 	.byte 0x1d, 0x1e, 0x00, 0x20, 0x21, 0x22, 0x23, 0x24
@@ -57,36 +40,9 @@ gUnknown_082F2AA8:: @ 82F2AA8
 
 	.align 2
 gUnknown_082F2BA8:: @ 82F2BA8
-	.4byte gUnknown_0862B9F9
-	.4byte gUnknown_0862B9FF
-	.4byte gUnknown_0862BA05
-	.4byte gUnknown_0862BA0B
-	.4byte gUnknown_0862BA11
-	.4byte gUnknown_0862BA17
-	.4byte gUnknown_0862BA1D
-	.4byte gUnknown_0862BA23
-	.4byte gUnknown_0862BA29
-	.4byte gUnknown_0862BA2F
-	.4byte gUnknown_0862BA35
-	.4byte gUnknown_0862BA3B
-	.4byte gUnknown_0862BA41
-	.4byte gUnknown_0862BA47
-	.4byte gUnknown_0862BA4D
-	.4byte gUnknown_0862BA53
-	.4byte gUnknown_0862BA59
-	.4byte gUnknown_0862BA5F
-	.4byte gUnknown_0862BA65
-	.4byte gUnknown_0862BA6B
-	.4byte gUnknown_0862BA79
-	.4byte gUnknown_0862BA84
-	.4byte gUnknown_0862BA8F
-	.4byte gUnknown_0862BA9A
-	.4byte gUnknown_0862BAA3
-	.4byte gUnknown_0862BAAE
-	.4byte gUnknown_0862BAB9
-	.4byte gUnknown_0862BAC4
-	.4byte gUnknown_0862BACF
-	.4byte gUnknown_0862BADA
+	.4byte gUnknown_0862B9F9, gUnknown_0862B9FF, gUnknown_0862BA05, gUnknown_0862BA0B, gUnknown_0862BA11, gUnknown_0862BA17, gUnknown_0862BA1D, gUnknown_0862BA23, gUnknown_0862BA29, gUnknown_0862BA2F
+	.4byte gUnknown_0862BA35, gUnknown_0862BA3B, gUnknown_0862BA41, gUnknown_0862BA47, gUnknown_0862BA4D, gUnknown_0862BA53, gUnknown_0862BA59, gUnknown_0862BA5F, gUnknown_0862BA65, gUnknown_0862BA6B
+	.4byte gUnknown_0862BA79, gUnknown_0862BA84, gUnknown_0862BA8F, gUnknown_0862BA9A, gUnknown_0862BAA3, gUnknown_0862BAAE, gUnknown_0862BAB9, gUnknown_0862BAC4, gUnknown_0862BACF, gUnknown_0862BADA
 
 	.align 2
 gUnknown_082F2C20:: @ 82F2C20