Merge remote-tracking branch 'pret/master'

INSTALL.md

@@ -8,6 +8,6 @@ TBD
 
 Install [**devkitARM**](http://devkitpro.org/wiki/Getting_Started/devkitARM).
 
-Then get the compiled tools from https://github.com/YamaArashi/pokeruby-tools. Copy the "tools" folder over the "tools" folder in your pokeemerald directory.
+Then download [**pokeruby-tools**](https://github.com/pret/pokeruby-tools). Copy the `tools/` folder with the compiled `exe`s to the `tools/` folder in your `pokeemerald/` directory.
 
-You can then build pokeemerald using "make" in the MSYS environment provided with devkitARM.
+You can then build pokeemerald using `make` in the MSYS environment provided with devkitARM.

asm/battle_frontier_1.s

@@ -7383,12 +7383,12 @@ _08192932:
 	ldr r1, [sp, 0x24]
 	cmp r1, r0
 	bne _08192980
-	ldr r0, =gUnknown_0860D1D0
+	ldr r0, =gBattleDomePotentialPointers
 	ldr r0, [r0, 0x40]
 	b _0819298A
 	.pool
 _08192980:
-	ldr r0, =gUnknown_0860D1D0
+	ldr r0, =gBattleDomePotentialPointers
 	ldr r2, [sp, 0x20]
 	lsls r1, r2, 2
 	adds r1, r0
@@ -7503,7 +7503,7 @@ _08192A58:
 	cmp r7, 0x2
 	ble _081929AE
 	movs r7, 0
-	ldr r2, =gUnknown_0860D214
+	ldr r2, =gBattleDomeOpponentStylePointers
 	mov r9, r2
 	ldr r3, =gUnknown_0860C988
 	mov r10, r3
@@ -8071,7 +8071,7 @@ _08192ED0:
 	movs r7, 0x2A
 _08192ED2:
 	lsls r0, r7, 2
-	ldr r3, =gUnknown_0860D294
+	ldr r3, =gBattleDomeOpponentStatsPointers
 	adds r0, r3
 	ldr r0, [r0]
 	str r0, [sp, 0xC]
@@ -9029,7 +9029,7 @@ _081936A0:
 	movs r0, 0xD0
 	strb r0, [r1, 0xD]
 	ldr r4, =gStringVar4
-	ldr r0, =gUnknown_0860D38C
+	ldr r0, =gBattleDomeWinStringsPointers
 	ldr r7, [sp, 0x70]
 	adds r0, r7, r0
 	ldr r1, [r0]
@@ -9167,7 +9167,7 @@ _08193802:
 	bl AddTextPrinter
 	add r0, sp, 0xC
 	strb r6, [r0, 0xA]
-	ldr r0, =gUnknown_0860D350
+	ldr r0, =gBattleDomeMatchNumberPointers
 	ldr r1, [sp, 0x58]
 	adds r0, r1, r0
 	ldr r0, [r0]
@@ -13791,7 +13791,7 @@ sub_8195FF8: @ 8195FF8
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r4, 0
-	ldr r6, =gUnknown_085500A4
+	ldr r6, =gRematchTable
 _08196000:
 	movs r1, 0xAE
 	lsls r1, 1
@@ -13887,7 +13887,7 @@ task_prev_quest: @ 81960A8
 	cmp r0, 0
 	bne _081960C2
 	bl ScriptContext2_Enable
-	bl player_bitmagic
+	bl FreezeMapObjects
 	bl sub_808B864
 	bl sub_808BCF4
 _081960C2:
@@ -14659,7 +14659,7 @@ sub_8196710: @ 8196710
 	thumb_func_start sub_819672C
 sub_819672C: @ 819672C
 	push {lr}
-	ldr r1, =gUnknown_085500A4
+	ldr r1, =gRematchTable
 	lsls r0, 4
 	adds r0, r1
 	ldrh r2, [r0, 0xA]
@@ -14677,10 +14677,10 @@ sub_8196748: @ 8196748
 	push {r4-r6,lr}
 	movs r5, 0
 	movs r6, 0
-	ldr r4, =gUnknown_085500A4
+	ldr r4, =gRematchTable
 _08196750:
 	ldrh r0, [r4]
-	bl HasTrainerAlreadyBeenFought
+	bl HasTrainerBeenFought
 	lsls r0, 24
 	cmp r0, 0
 	beq _0819675E
@@ -14703,10 +14703,10 @@ sub_8196774: @ 8196774
 	adds r7, r0, 0
 	movs r4, 0
 	movs r6, 0
-	ldr r5, =gUnknown_085500A4
+	ldr r5, =gRematchTable
 _0819677E:
 	ldrh r0, [r5]
-	bl HasTrainerAlreadyBeenFought
+	bl HasTrainerBeenFought
 	lsls r0, 24
 	cmp r0, 0
 	beq _0819679A
@@ -14766,7 +14766,7 @@ _081967EC:
 	adds r4, r0, 0
 	movs r7, 0x1
 	adds r0, r5, 0
-	bl sub_80B1E94
+	bl UpdateRematchIfDefeated
 	b _08196832
 _0819680A:
 	bl Random
@@ -15270,7 +15270,7 @@ sub_8196B98: @ 8196B98
 	adds r7, r0, 0
 	cmp r1, 0xFF
 	beq _08196C5C
-	ldr r1, =gUnknown_085500A4
+	ldr r1, =gRematchTable
 	lsls r0, r2, 4
 	adds r2, r0, r1
 	ldrh r4, [r2, 0xA]
@@ -15373,7 +15373,7 @@ sub_8196C70: @ 8196C70
 	lsls r1, 2
 	adds r1, r2
 	ldrh r0, [r1]
-	bl sub_80B2250
+	bl GetLastBeatenRematchTrainerId
 	lsls r0, 16
 	lsrs r0, 16
 	ldr r5, =gTrainers

asm/battle_frontier_2.s

@@ -12380,7 +12380,7 @@ _081A0C8E:
 sub_81A0C9C: @ 81A0C9C
 	push {lr}
 	bl ScriptContext2_Enable
-	bl player_bitmagic
+	bl FreezeMapObjects
 	bl sub_808B864
 	bl sub_808BCF4
 	movs r0, 0
@@ -29290,7 +29290,7 @@ sub_81A9B04: @ 81A9B04
 	cmp r0, 0
 	beq _081A9B2E
 	movs r0, 0x1
-	bl sub_80B47E0
+	bl GetChosenApproachingTrainerMapObjectId
 	ldr r1, =gSelectedMapObject
 	strb r0, [r1]
 	ldr r0, =gTrainerBattleOpponent_B

asm/battle_tower.s

@@ -3534,7 +3534,7 @@ _08163E10:
 	bl sub_80B100C
 	lsls r0, 24
 	lsrs r0, 24
-	bl sub_8145EF4
+	bl BattleTransition_StartOnField
 	b _08163E68
 	.pool
 _08163E2C:
@@ -3544,7 +3544,7 @@ _08163E2C:
 	ldr r5, =0x00000c03
 	adds r0, r5, 0
 	bl sub_8165404
-	ldr r4, =gUnknown_02038BFC
+	ldr r4, =gApproachingTrainerId
 	movs r0, 0
 	strb r0, [r4]
 	ldr r0, =MossdeepCity_SpaceCenter_2F_EventScript_224157 + 1
@@ -3561,7 +3561,7 @@ _08163E2C:
 	movs r0, 0
 	bl PlayMapChosenOrBattleBGM
 	movs r0, 0x12
-	bl sub_8145EF4
+	bl BattleTransition_StartOnField
 _08163E68:
 	add sp, 0x4
 	pop {r4-r6}

asm/battle_transition.s

@@ -57,8 +57,8 @@ TestBattleTransition: @ 8145EDC
 	.pool
 	thumb_func_end TestBattleTransition
 
-	thumb_func_start sub_8145EF4
+	thumb_func_start BattleTransition_StartOnField
-sub_8145EF4: @ 8145EF4
+BattleTransition_StartOnField: @ 8145EF4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -69,17 +69,17 @@ sub_8145EF4: @ 8145EF4
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_8145EF4
+	thumb_func_end BattleTransition_StartOnField
 
-	thumb_func_start sub_8145F10
+	thumb_func_start BattleTransition_Start
-sub_8145F10: @ 8145F10
+BattleTransition_Start: @ 8145F10
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
 	bl LaunchBattleTransitionTask
 	pop {r0}
 	bx r0
-	thumb_func_end sub_8145F10
+	thumb_func_end BattleTransition_Start
 
 	thumb_func_start IsBattleTransitionDone
 IsBattleTransitionDone: @ 8145F20

asm/berry_tag_screen.s

@@ -115,7 +115,7 @@ _08177CD8:
 	.4byte _08177DC2
 _08177D18:
 	bl SetVBlankHBlankCallbacksToNull
-	bl sub_8121DA0
+	bl ResetVramOamAndBgCntRegs
 	bl clear_scheduled_bg_copies_to_vram
 	b _08177DDC
 _08177D26:
@@ -246,7 +246,7 @@ sub_8177E14: @ 8177E14
 	adds r1, r0
 	movs r0, 0x3
 	bl SetBgTilemapBuffer
-	bl sub_8121E10
+	bl ResetAllBgsCoordinates
 	movs r0, 0x2
 	bl schedule_bg_copy_tilemap_to_vram
 	movs r0, 0x3

asm/bike.s

@@ -2004,7 +2004,7 @@ GetOnOffBike: @ 811A080
 	beq _0811A0B0
 	movs r0, 0x1
 	bl SetPlayerAvatarTransitionFlags
-	bl sav1_reset_battle_music_maybe
+	bl Overworld_ClearSavedMusic
 	bl sub_8085784
 	b _0811A0C4
 	.pool

asm/clock.s

@@ -1,175 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_809E778
-sub_809E778: @ 809E778
-	push {lr}
-	ldr r0, =0x00000895
-	bl FlagSet
-	bl RtcCalcLocalTime
-	ldr r0, =gSaveBlock2Ptr
-	ldr r2, [r0]
-	adds r2, 0xA0
-	ldr r3, =gLocalTime
-	ldr r0, [r3]
-	ldr r1, [r3, 0x4]
-	str r0, [r2]
-	str r1, [r2, 0x4]
-	ldr r0, =0x00004040
-	ldrh r1, [r3]
-	bl VarSet
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_809E778
-
-	thumb_func_start DoTimeBasedEvents
-DoTimeBasedEvents: @ 809E7B0
-	push {r4,lr}
-	ldr r0, =0x00000895
-	bl FlagGet
-	lsls r0, 24
-	cmp r0, 0
-	beq _0809E7DA
-	bl sub_813B9C0
-	lsls r0, 24
-	cmp r0, 0
-	bne _0809E7DA
-	bl RtcCalcLocalTime
-	ldr r4, =gLocalTime
-	adds r0, r4, 0
-	bl sub_809E7E8
-	adds r0, r4, 0
-	bl sub_809E858
-_0809E7DA:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end DoTimeBasedEvents
-
-	thumb_func_start sub_809E7E8
-sub_809E7E8: @ 809E7E8
-	push {r4-r6,lr}
-	adds r5, r0, 0
-	ldr r0, =0x00004040
-	bl GetVarPointer
-	adds r6, r0, 0
-	ldrh r0, [r6]
-	movs r2, 0
-	ldrsh r1, [r5, r2]
-	cmp r0, r1
-	beq _0809E84E
-	cmp r0, r1
-	bgt _0809E84E
-	ldrh r4, [r5]
-	subs r4, r0
-	lsls r4, 16
-	lsrs r4, 16
-	bl ClearUpperFlags
-	adds r0, r4, 0
-	bl sub_8122580
-	adds r0, r4, 0
-	bl sub_80ED888
-	adds r0, r4, 0
-	bl sub_80AEFBC
-	adds r0, r4, 0
-	bl UpdatePartyPokerusTime
-	adds r0, r4, 0
-	bl sub_8137904
-	adds r0, r4, 0
-	bl sub_8137A20
-	adds r0, r4, 0
-	bl sub_8139EF4
-	adds r0, r4, 0
-	bl sub_813A7F4
-	adds r0, r4, 0
-	bl sub_813945C
-	adds r0, r4, 0
-	bl SetRandomLotteryNumber
-	ldrh r0, [r5]
-	strh r0, [r6]
-_0809E84E:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_809E7E8
-
-	thumb_func_start sub_809E858
-sub_809E858: @ 809E858
-	push {r4-r6,lr}
-	sub sp, 0x8
-	adds r5, r0, 0
-	mov r4, sp
-	ldr r6, =gSaveBlock2Ptr
-	ldr r1, [r6]
-	adds r1, 0xA0
-	mov r0, sp
-	adds r2, r5, 0
-	bl CalcTimeDifference
-	mov r0, sp
-	movs r2, 0
-	ldrsh r1, [r0, r2]
-	lsls r0, r1, 1
-	adds r0, r1
-	lsls r1, r0, 4
-	subs r1, r0
-	lsls r1, 5
-	movs r2, 0x2
-	ldrsb r2, [r4, r2]
-	lsls r0, r2, 4
-	subs r0, r2
-	lsls r0, 2
-	adds r1, r0
-	movs r0, 0x3
-	ldrsb r0, [r4, r0]
-	adds r0, r1, r0
-	cmp r0, 0
-	beq _0809E8A8
-	cmp r0, 0
-	blt _0809E8A8
-	bl BerryTreeTimeUpdate
-	ldr r2, [r6]
-	adds r2, 0xA0
-	ldr r0, [r5]
-	ldr r1, [r5, 0x4]
-	str r0, [r2]
-	str r1, [r2, 0x4]
-_0809E8A8:
-	add sp, 0x8
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_809E858
-
-	thumb_func_start sub_809E8B4
-sub_809E8B4: @ 809E8B4
-	push {lr}
-	bl sub_809E778
-	ldr r0, =c2_exit_to_overworld_1_continue_scripts_restart_music
-	bl SetMainCallback2
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_809E8B4
-
-	thumb_func_start Special_StartWallClock
-Special_StartWallClock: @ 809E8C8
-	push {lr}
-	ldr r0, =Cb2_StartWallClock
-	bl SetMainCallback2
-	ldr r1, =gMain
-	ldr r0, =sub_809E8B4
-	str r0, [r1, 0x8]
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end Special_StartWallClock
-
-	.align 2, 0 @ Don't pad with nop.

asm/contest_painting.s

@@ -386,7 +386,7 @@ sub_813010C: @ 813010C
 	ldr r1, =gText_Space
 	adds r0, r4, 0
 	bl StringAppend
-	ldr r1, =gUnknown_085B07D4
+	ldr r1, =gContestRankTextPointers
 	ldr r0, [r6]
 	ldrb r0, [r0, 0x1E]
 	lsls r0, 2
@@ -415,7 +415,7 @@ _08130190:
 	adds r1, 0xB
 	bl StringCopy
 	ldr r0, =gStringVar4
-	ldr r2, =gUnknown_085B07F4
+	ldr r2, =gContestPaintingDescriptionPointers
 	lsls r1, r5, 2
 	adds r1, r2
 	ldr r1, [r1]

asm/dewford_trend.s

@@ -79,8 +79,8 @@ _08122522:
 	.pool
 	thumb_func_end InitDewfordTrend
 
-	thumb_func_start sub_8122580
+	thumb_func_start UpdateDewfordTrendPerDay
-sub_8122580: @ 8122580
+UpdateDewfordTrendPerDay: @ 8122580
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -253,7 +253,7 @@ _081226BE:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_8122580
+	thumb_func_end UpdateDewfordTrendPerDay
 
 	thumb_func_start sub_81226D8
 sub_81226D8: @ 81226D8

asm/easy_chat.s

@@ -1635,7 +1635,7 @@ _0811AF86:
 	thumb_func_start sub_811AF8C
 sub_811AF8C: @ 811AF8C
 	push {lr}
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -1684,7 +1684,7 @@ _0811AFE6:
 	thumb_func_start sub_811AFEC
 sub_811AFEC: @ 811AFEC
 	push {r4,lr}
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -1727,7 +1727,7 @@ _0811B03A:
 	thumb_func_start sub_811B040
 sub_811B040: @ 811B040
 	push {lr}
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -1832,7 +1832,7 @@ sub_811B0E8: @ 811B0E8
 	thumb_func_start sub_811B0F8
 sub_811B0F8: @ 811B0F8
 	push {r4,lr}
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0

asm/field_control_avatar.s

@@ -721,7 +721,7 @@ TryGetInvisibleMapObjectScript: @ 809C458
 	ldr r2, [r0, 0x8]
 	cmp r2, 0
 	bne _0809C490
-	ldr r0, =EventScript_2C8436
+	ldr r0, =EventScript_TestSignpostMsg
 	b _0809C532
 	.pool
 _0809C490:
@@ -1365,7 +1365,7 @@ per_step_scripts: @ 809C9F4
 	bne _0809CA04
 	b _0809CB24
 _0809CA04:
-	bl sub_80B215C
+	bl IncrementRematchStepCounter
 	bl AdjustFriendship_step
 	bl sub_81D4998
 	ldr r0, =gPlayerAvatar
@@ -1531,8 +1531,8 @@ _0809CB72:
 	.pool
 	thumb_func_end AdjustFriendship_step
 
-	thumb_func_start overworld_poison_timer_set
+	thumb_func_start ResetPoisonStepCounter
-overworld_poison_timer_set: @ 809CB80
+ResetPoisonStepCounter: @ 809CB80
 	push {lr}
 	ldr r0, =0x0000402b
 	movs r1, 0
@@ -1540,7 +1540,7 @@ overworld_poison_timer_set: @ 809CB80
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end overworld_poison_timer_set
+	thumb_func_end ResetPoisonStepCounter
 
 	thumb_func_start overworld_poison_step
 overworld_poison_step: @ 809CB94

asm/field_effect.s

@@ -1961,7 +1961,7 @@ mapldr_080842E8: @ 80B69FC
 	movs r1, 0
 	bl CreateTask
 	bl ScriptContext2_Enable
-	bl player_bitmagic
+	bl FreezeMapObjects
 	ldr r1, =gFieldCallback
 	movs r0, 0
 	str r0, [r1]
@@ -2057,7 +2057,7 @@ mapldr_08084390: @ 80B6AA4
 	bl FieldObjectTurn
 _080B6AE6:
 	bl ScriptContext2_Enable
-	bl player_bitmagic
+	bl FreezeMapObjects
 	ldr r1, =gFieldCallback
 	movs r0, 0
 	str r0, [r1]
@@ -2116,7 +2116,7 @@ sub_80B6B68: @ 80B6B68
 	bl sub_8085784
 	bl pal_fill_for_maplights
 	bl ScriptContext2_Enable
-	bl player_bitmagic
+	bl FreezeMapObjects
 	ldr r0, =sub_80B6B94
 	movs r1, 0
 	bl CreateTask
@@ -2534,7 +2534,7 @@ _080B6E9A:
 sub_80B6EC0: @ 80B6EC0
 	push {r4,lr}
 	adds r4, r0, 0
-	bl player_bitmagic
+	bl FreezeMapObjects
 	bl CameraObjectReset2
 	ldrb r0, [r4, 0xA]
 	bl sub_80E1558
@@ -3476,7 +3476,7 @@ sub_80B764C: @ 80B764C
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	adds r5, r1, 0
-	bl player_bitmagic
+	bl FreezeMapObjects
 	bl CameraObjectReset2
 	movs r0, 0
 	bl SetCameraPanningCallback
@@ -3807,7 +3807,7 @@ sub_80B78EC: @ 80B78EC
 	adds r5, r0, 0
 	adds r4, r1, 0
 	bl CameraObjectReset2
-	bl player_bitmagic
+	bl FreezeMapObjects
 	ldr r1, =gPlayerAvatar
 	movs r0, 0x1
 	strb r0, [r1, 0x6]
@@ -4055,7 +4055,7 @@ sub_80B7AE8: @ 80B7AE8
 	push {r4,r5,lr}
 	adds r5, r0, 0
 	adds r4, r1, 0
-	bl player_bitmagic
+	bl FreezeMapObjects
 	bl CameraObjectReset2
 	ldr r1, =gPlayerAvatar
 	movs r0, 0x1
@@ -4287,7 +4287,7 @@ _080B7CC4:
 sub_80B7CC8: @ 80B7CC8
 	push {lr}
 	bl ScriptContext2_Enable
-	bl player_bitmagic
+	bl FreezeMapObjects
 	ldr r0, =sub_80B7CE4
 	movs r1, 0x50
 	bl CreateTask
@@ -4461,7 +4461,7 @@ mapldr_080859D4: @ 80B7E48
 	bl sub_8085784
 	bl pal_fill_for_maplights
 	bl ScriptContext2_Enable
-	bl player_bitmagic
+	bl FreezeMapObjects
 	ldr r1, =gFieldCallback
 	movs r0, 0
 	str r0, [r1]
@@ -4672,7 +4672,7 @@ sub_80B800C: @ 80B800C
 	push {r4,lr}
 	adds r4, r0, 0
 	bl ScriptContext2_Enable
-	bl player_bitmagic
+	bl FreezeMapObjects
 	bl CameraObjectReset2
 	bl player_get_direction_lower_nybble
 	lsls r0, 24
@@ -4906,7 +4906,7 @@ mapldr_08085D88: @ 80B8200
 	bl sub_8085784
 	bl pal_fill_for_maplights
 	bl ScriptContext2_Enable
-	bl player_bitmagic
+	bl FreezeMapObjects
 	ldr r1, =gFieldCallback
 	movs r0, 0
 	str r0, [r1]
@@ -6295,7 +6295,7 @@ sub_80B8D44: @ 80B8D44
 	ldr r0, =gFieldEffectArguments
 	ldr r0, [r0]
 	strh r0, [r1, 0x26]
-	bl sav1_reset_battle_music_maybe
+	bl Overworld_ClearSavedMusic
 	ldr r0, =0x0000016d
 	bl Overworld_ChangeMusicTo
 	movs r0, 0
@@ -6334,7 +6334,7 @@ sub_80B8DB4: @ 80B8DB4
 	push {r6}
 	adds r4, r0, 0
 	bl ScriptContext2_Enable
-	bl player_bitmagic
+	bl FreezeMapObjects
 	ldr r5, =gPlayerAvatar
 	movs r0, 0x1
 	strb r0, [r5, 0x6]

asm/field_player_avatar.s

@@ -3896,7 +3896,7 @@ sub_808C750: @ 808C750
 	lsls r4, 24
 	lsrs r4, 24
 	bl ScriptContext2_Enable
-	bl sav1_reset_battle_music_maybe
+	bl Overworld_ClearSavedMusic
 	bl Overworld_ChangeMusicToDefault
 	ldr r2, =gPlayerAvatar
 	ldrb r1, [r2]

asm/field_screen.s

@@ -7527,15 +7527,15 @@ SetSav1Weather: @ 80AED7C
 	.pool
 	thumb_func_end SetSav1Weather
 
-	thumb_func_start sav1_get_weather_probably
+	thumb_func_start GetSav1Weather
-sav1_get_weather_probably: @ 80AEDAC
+GetSav1Weather: @ 80AEDAC
 	ldr r0, =gSaveBlock1Ptr
 	ldr r0, [r0]
 	adds r0, 0x2E
 	ldrb r0, [r0]
 	bx lr
 	.pool
-	thumb_func_end sav1_get_weather_probably
+	thumb_func_end GetSav1Weather
 
 	thumb_func_start sub_80AEDBC
 sub_80AEDBC: @ 80AEDBC
@@ -7565,7 +7565,7 @@ sub_80AEDBC: @ 80AEDBC
 sub_80AEDF0: @ 80AEDF0
 	push {lr}
 	bl SetSav1Weather
-	bl sav1_get_weather_probably
+	bl GetSav1Weather
 	lsls r0, 24
 	lsrs r0, 24
 	bl weather_set
@@ -7577,7 +7577,7 @@ sub_80AEDF0: @ 80AEDF0
 sub_80AEE08: @ 80AEE08
 	push {lr}
 	bl SetSav1Weather
-	bl sav1_get_weather_probably
+	bl GetSav1Weather
 	lsls r0, 24
 	lsrs r0, 24
 	bl sub_80AB104
@@ -7588,7 +7588,7 @@ sub_80AEE08: @ 80AEE08
 	thumb_func_start DoCurrentWeather
 DoCurrentWeather: @ 80AEE20
 	push {r4,r5,lr}
-	bl sav1_get_weather_probably
+	bl GetSav1Weather
 	lsls r0, 24
 	lsrs r4, r0, 24
 	cmp r4, 0xF
@@ -7632,7 +7632,7 @@ _080AEE6E:
 	thumb_func_start sub_80AEE84
 sub_80AEE84: @ 80AEE84
 	push {r4,r5,lr}
-	bl sav1_get_weather_probably
+	bl GetSav1Weather
 	lsls r0, 24
 	lsrs r4, r0, 24
 	cmp r4, 0xF
@@ -7777,8 +7777,8 @@ _080AEFB6:
 	bx r1
 	thumb_func_end sub_80AEEE8
 
-	thumb_func_start sub_80AEFBC
+	thumb_func_start UpdateWeatherPerDay
-sub_80AEFBC: @ 80AEFBC
+UpdateWeatherPerDay: @ 80AEFBC
 	lsls r0, 16
 	ldr r1, =gSaveBlock1Ptr
 	ldr r2, [r1]
@@ -7794,7 +7794,7 @@ sub_80AEFBC: @ 80AEFBC
 	strb r1, [r2]
 	bx lr
 	.pool
-	thumb_func_end sub_80AEFBC
+	thumb_func_end UpdateWeatherPerDay
 
 	thumb_func_start sub_80AEFDC
 sub_80AEFDC: @ 80AEFDC
@@ -8382,7 +8382,7 @@ _080AF46C:
 _080AF480:
 	movs r0, 0
 	bl sub_80AF0F4
-	bl player_bitmagic
+	bl FreezeMapObjects
 	adds r0, r6, 0
 	adds r1, r7, 0
 	bl PlayerGetDestCoords
@@ -8508,7 +8508,7 @@ _080AF580:
 _080AF58A:
 	movs r0, 0
 	bl sub_80AF0F4
-	bl player_bitmagic
+	bl FreezeMapObjects
 	adds r0, r6, 0
 	adds r1, r7, 0
 	bl PlayerGetDestCoords
@@ -8583,7 +8583,7 @@ task_map_chg_seq_0807E2CC: @ 80AF610
 	b _080AF65A
 	.pool
 _080AF634:
-	bl player_bitmagic
+	bl FreezeMapObjects
 	bl ScriptContext2_Enable
 	ldrh r0, [r4, 0x8]
 	adds r0, 0x1
@@ -9062,7 +9062,7 @@ _080AFA34:
 	beq _080AFA6C
 	b _080AFA7C
 _080AFA3A:
-	bl player_bitmagic
+	bl FreezeMapObjects
 	bl ScriptContext2_Enable
 	b _080AFA64
 _080AFA44:
@@ -9133,7 +9133,7 @@ _080AFAC0:
 	.4byte _080AFBB8
 	.4byte _080AFBD4
 _080AFAD4:
-	bl player_bitmagic
+	bl FreezeMapObjects
 	adds r0, r4, 0
 	adds r1, r6, 0
 	bl PlayerGetDestCoords
@@ -9290,7 +9290,7 @@ _080AFC1C:
 	beq _080AFC46
 	b _080AFC56
 _080AFC22:
-	bl player_bitmagic
+	bl FreezeMapObjects
 	bl ScriptContext2_Enable
 	b _080AFC3E
 _080AFC2C:
@@ -9877,7 +9877,7 @@ sub_80B009C: @ 80B009C
 	lsls r0, 24
 	lsrs r0, 24
 	adds r4, r0, 0
-	bl sav1_get_flash_used_on_map
+	bl Overworld_GetFlashLevel
 	lsls r0, 24
 	lsrs r0, 24
 	movs r5, 0
@@ -9982,7 +9982,7 @@ task0A_mpl_807E31C: @ 80B0160
 	b _080B01B6
 	.pool
 _080B0184:
-	bl player_bitmagic
+	bl FreezeMapObjects
 	bl ScriptContext2_Enable
 	bl sub_808D194
 	ldrh r0, [r4, 0x8]
@@ -10033,7 +10033,7 @@ _080B01E4:
 	beq _080B022A
 	b _080B023A
 _080B01EE:
-	bl player_bitmagic
+	bl FreezeMapObjects
 	bl ScriptContext2_Enable
 	movs r0, 0x2D
 	bl PlaySE

asm/fldeff_80F9BCC.s

@@ -2275,8 +2275,8 @@ overworld_poison_effect: @ 80FAEA8
 	.pool
 	thumb_func_end overworld_poison_effect
 
-	thumb_func_start c3_80A0DD8_is_running
+	thumb_func_start FieldPoisonEffectIsRunning
-c3_80A0DD8_is_running: @ 80FAEC0
+FieldPoisonEffectIsRunning: @ 80FAEC0
 	push {lr}
 	ldr r0, =task50_overworld_poison_effect
 	bl FuncIsActiveTask
@@ -2285,7 +2285,7 @@ c3_80A0DD8_is_running: @ 80FAEC0
 	pop {r1}
 	bx r1
 	.pool
-	thumb_func_end c3_80A0DD8_is_running
+	thumb_func_end FieldPoisonEffectIsRunning
 
 	thumb_func_start sub_80FAED4
 sub_80FAED4: @ 80FAED4

asm/international_string_util.s

@@ -113,8 +113,8 @@ _081DB4D4:
 	bx r1
 	thumb_func_end sub_81DB494
 
-	thumb_func_start sub_81DB4DC
+	thumb_func_start PadNameString
-sub_81DB4DC: @ 81DB4DC
+PadNameString: @ 81DB4DC
 	push {r4,r5,lr}
 	adds r4, r0, 0
 	lsls r1, 24
@@ -156,7 +156,7 @@ _081DB51E:
 	pop {r4,r5}
 	pop {r0}
 	bx r0
-	thumb_func_end sub_81DB4DC
+	thumb_func_end PadNameString
 
 	thumb_func_start sub_81DB52C
 sub_81DB52C: @ 81DB52C

asm/item_menu.s

@@ -463,7 +463,7 @@ _081AAF54:
 	adds r5, r0, 0
 	lsls r5, 24
 	lsrs r5, 24
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	ldrb r2, [r4, 0x5]
 	lsls r2, 1
 	adds r1, r4, 0
@@ -568,7 +568,7 @@ _081AB046:
 	thumb_func_start bag_menu_init_bgs
 bag_menu_init_bgs: @ 81AB050
 	push {r4,lr}
-	bl sub_8121DA0
+	bl ResetVramOamAndBgCntRegs
 	ldr r4, =gUnknown_0203CE54
 	ldr r0, [r4]
 	adds r0, 0x4
@@ -586,7 +586,7 @@ bag_menu_init_bgs: @ 81AB050
 	adds r1, 0x4
 	movs r0, 0x2
 	bl SetBgTilemapBuffer
-	bl sub_8121E10
+	bl ResetAllBgsCoordinates
 	movs r0, 0x2
 	bl schedule_bg_copy_tilemap_to_vram
 	movs r1, 0x82
@@ -719,7 +719,7 @@ _081AB1B2:
 	b _081AB1E4
 	.pool
 _081AB1CC:
-	bl sub_8122328
+	bl LoadListMenuArrowsGfx
 	ldr r0, [r4]
 	ldr r1, =0x00000834
 	adds r0, r1
@@ -902,7 +902,7 @@ _081AB30C:
 	cmp r6, r0
 	bcc _081AB30C
 _081AB34A:
-	ldr r2, =gUnknown_03006310
+	ldr r2, =gMultiuseListMenuTemplate
 	adds r1, r2, 0
 	ldr r0, =gUnknown_08613F9C
 	ldm r0!, {r3-r5}
@@ -1924,7 +1924,7 @@ bag_menu_inits_lists_menu: @ 81ABBBC
 	bl sub_81ABA88
 	ldrb r0, [r7, 0x5]
 	bl load_bag_item_list_buffers
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	mov r2, r8
 	ldrh r1, [r2]
 	ldrh r2, [r4]
@@ -2133,7 +2133,7 @@ _081ABDCC:
 	ldrb r0, [r6]
 	adds r1, r7, 0
 	mov r2, r8
-	bl get_coro_args_x18_x1A
+	bl sub_81AE860
 	ldrh r2, [r7]
 	mov r3, r8
 	ldrh r0, [r3]
@@ -2157,12 +2157,12 @@ _081ABDCC:
 	.pool
 _081ABE10:
 	ldrb r0, [r6]
-	bl ListMenuHandleInput
+	bl ListMenuHandleInputGetItemId
 	adds r4, r0, 0
 	ldrb r0, [r6]
 	adds r1, r7, 0
 	mov r2, r8
-	bl get_coro_args_x18_x1A
+	bl sub_81AE860
 	movs r0, 0x2
 	negs r0, r0
 	cmp r4, r0
@@ -2603,7 +2603,7 @@ _081AC1DC:
 	subs r5, r4, 0x5
 	ldrb r0, [r5, 0x5]
 	bl load_bag_item_list_buffers
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	ldrb r2, [r5, 0x5]
 	lsls r2, 1
 	adds r1, r4, 0
@@ -2847,12 +2847,12 @@ sub_81AC3C0: @ 81AC3C0
 	adds r1, r2, r1
 	adds r3, 0x8
 	adds r2, r3
-	bl get_coro_args_x18_x1A
+	bl sub_81AE860
 	b _081AC472
 	.pool
 _081AC418:
 	ldrb r0, [r4]
-	bl ListMenuHandleInput
+	bl ListMenuHandleInputGetItemId
 	adds r7, r0, 0
 	ldrb r0, [r4]
 	ldr r5, =gUnknown_0203CE58
@@ -2864,7 +2864,7 @@ _081AC418:
 	adds r4, r5, 0
 	adds r4, 0x8
 	adds r2, r4
-	bl get_coro_args_x18_x1A
+	bl sub_81AE860
 	movs r0, 0
 	bl sub_80D4FC8
 	ldrb r0, [r5, 0x5]
@@ -2989,7 +2989,7 @@ _081AC4F8:
 _081AC538:
 	ldrb r0, [r5, 0x5]
 	bl load_bag_item_list_buffers
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	mov r2, r8
 	ldrh r1, [r2]
 	ldrh r2, [r7]
@@ -3070,7 +3070,7 @@ sub_81AC590: @ 81AC590
 _081AC5F2:
 	ldrb r0, [r4, 0x5]
 	bl load_bag_item_list_buffers
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	ldrh r1, [r6]
 	ldrh r2, [r5]
 	bl ListMenuInit
@@ -3360,7 +3360,7 @@ _081AC8D4:
 	bl memcpy
 	ldr r0, =gSpecialVar_ItemId
 	ldrh r0, [r0]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -4326,7 +4326,7 @@ Task_ActuallyToss: @ 81AD150
 	bl sub_81ABA88
 	ldrb r0, [r4, 0x5]
 	bl load_bag_item_list_buffers
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	mov r2, r8
 	ldrh r1, [r2]
 	ldrh r2, [r7]
@@ -4388,7 +4388,7 @@ _081AD23A:
 	ldr r0, =gUnknown_0203CE58
 	ldrb r0, [r0, 0x5]
 	bl load_bag_item_list_buffers
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	ldrh r1, [r6]
 	ldrh r2, [r5]
 	bl ListMenuInit
@@ -4664,7 +4664,7 @@ item_menu_type_b: @ 81AD4B4
 	lsrs r4, r0, 24
 	ldr r5, =gSpecialVar_ItemId
 	ldrh r0, [r5]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -4748,7 +4748,7 @@ _081AD550:
 	cmp r6, 0x1
 	bne _081AD5C4
 	bl ScriptContext2_Enable
-	bl player_bitmagic
+	bl FreezeMapObjects
 	bl sub_808B864
 	bl sub_808BCF4
 	ldr r2, =gSpecialVar_ItemId
@@ -5155,7 +5155,7 @@ sub_81AD8C8: @ 81AD8C8
 	bl sub_81ABA88
 	ldrb r0, [r7, 0x5]
 	bl load_bag_item_list_buffers
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	mov r2, r9
 	ldrh r1, [r2]
 	ldrh r2, [r5]

asm/item_use.s

@@ -266,7 +266,7 @@ sub_80FD254: @ 80FD254
 	ldr r1, =bag_menu_mail_related
 	mov r0, sp
 	movs r2, 0
-	bl sub_8121478
+	bl ReadMail
 	add sp, 0x24
 	pop {r0}
 	bx r0
@@ -1497,7 +1497,7 @@ sub_80FDBEC: @ 80FDBEC
 	push {lr}
 	ldr r1, =bag_menu_mail_related
 	movs r0, 0
-	bl sub_81357FC
+	bl OpenPokeblockCase
 	pop {r0}
 	bx r0
 	.pool
@@ -1517,7 +1517,7 @@ sub_80FDC00: @ 80FDC00
 	bl overworld_free_bg_tilemaps
 	ldr r1, =c2_exit_to_overworld_2_switch
 	movs r0, 0
-	bl sub_81357FC
+	bl OpenPokeblockCase
 	adds r0, r4, 0
 	bl DestroyTask
 _080FDC24:

asm/learn_move.s

@@ -94,7 +94,7 @@ sub_81606A0: @ 81606A0
 	ldr r0, =gUnknown_085CEBB8
 	bl LoadSpritePalette
 	bl sub_81610B8
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	ldrh r1, [r4]
 	ldrh r2, [r4, 0x2]
 	bl ListMenuInit
@@ -151,7 +151,7 @@ sub_8160740: @ 8160740
 	ldr r0, =gUnknown_085CEBB8
 	bl LoadSpritePalette
 	bl sub_81610B8
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	ldrh r1, [r4]
 	ldrh r2, [r4, 0x2]
 	bl ListMenuInit
@@ -175,14 +175,14 @@ sub_8160740: @ 8160740
 	thumb_func_start sub_81607EC
 sub_81607EC: @ 81607EC
 	push {lr}
-	bl sub_8121DA0
+	bl ResetVramOamAndBgCntRegs
 	movs r0, 0
 	bl ResetBgsAndClearDma3BusyFlags
 	ldr r1, =gUnknown_085CEC28
 	movs r0, 0
 	movs r2, 0x2
 	bl InitBgsFromTemplates
-	bl sub_8121E10
+	bl ResetAllBgsCoordinates
 	movs r1, 0x82
 	lsls r1, 5
 	movs r0, 0
@@ -353,7 +353,7 @@ _08160994:
 	b _08160E88
 	.pool
 _081609A8:
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -433,7 +433,7 @@ _08160A50:
 	b _08160E88
 	.pool
 _08160A64:
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -493,7 +493,7 @@ _08160ADC:
 	b _08160E88
 	.pool
 _08160AEC:
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -551,7 +551,7 @@ _08160B6C:
 	b _08160E88
 	.pool
 _08160B80:
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -980,7 +980,7 @@ sub_8160F50: @ 8160F50
 	lsls r4, 1
 	adds r0, r4
 	ldrb r0, [r0]
-	bl ListMenuHandleInput
+	bl ListMenuHandleInputGetItemId
 	adds r5, r0, 0
 	ldr r0, [r6]
 	adds r0, r4
@@ -988,7 +988,7 @@ sub_8160F50: @ 8160F50
 	ldr r4, =gUnknown_0203BC38
 	adds r2, r4, 0x2
 	adds r1, r4, 0
-	bl get_coro_args_x18_x1A
+	bl sub_81AE860
 	movs r0, 0x2
 	negs r0, r0
 	cmp r5, r0

asm/link.s

@@ -18243,7 +18243,7 @@ _08012938:
 	ldrb r0, [r6, 0xF]
 	movs r1, 0
 	bl sub_81973FC
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	adds r2, r0, 0
 	ldr r1, =gUnknown_082F015C
 	ldm r1!, {r3,r5,r7}
@@ -19724,7 +19724,7 @@ _0801360C:
 	ldrb r0, [r6, 0xB]
 	movs r1, 0
 	bl sub_81973FC
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	adds r2, r0, 0
 	ldr r1, =gUnknown_082F0204
 	ldm r1!, {r3,r5,r7}
@@ -19769,7 +19769,7 @@ _080136EA:
 	b _08013A72
 _080136F2:
 	ldrb r0, [r6, 0xE]
-	bl ListMenuHandleInput
+	bl ListMenuHandleInputGetItemId
 	adds r4, r0, 0
 	ldr r0, =gMain
 	ldrh r1, [r0, 0x2E]
@@ -21038,7 +21038,7 @@ sub_8014210: @ 8014210
 	adds r6, r0, 0
 	lsls r6, 16
 	lsrs r6, 16
-	bl sp000_heal_pokemon
+	bl HealPlayerParty
 	bl copy_player_party_to_sav1
 	bl copy_bags_and_unk_data_from_save_blocks
 	ldr r5, =gLinkPlayers
@@ -21406,7 +21406,7 @@ _080145F4:
 	ldr r0, =gBlockSendBuffer
 	movs r1, 0x1
 	bl sub_80143E4
-	bl sp000_heal_pokemon
+	bl HealPlayerParty
 	bl copy_player_party_to_sav1
 	bl copy_bags_and_unk_data_from_save_blocks
 	movs r0, 0x1
@@ -21419,7 +21419,7 @@ _080145F4:
 	.pool
 _08014620:
 	bl overworld_free_bg_tilemaps
-	bl sp000_heal_pokemon
+	bl HealPlayerParty
 	bl copy_player_party_to_sav1
 	bl copy_bags_and_unk_data_from_save_blocks
 	ldr r0, =gBlockSendBuffer
@@ -21435,7 +21435,7 @@ _08014620:
 	.pool
 _0801464C:
 	bl overworld_free_bg_tilemaps
-	bl sp000_heal_pokemon
+	bl HealPlayerParty
 	bl copy_player_party_to_sav1
 	bl copy_bags_and_unk_data_from_save_blocks
 	ldr r0, =gBlockSendBuffer
@@ -21969,7 +21969,7 @@ _08014AEC:
 	strb r0, [r5, 0xF]
 	ldrb r0, [r5, 0xF]
 	bl sub_8018784
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	adds r2, r0, 0
 	ldr r1, =gUnknown_082F015C
 	ldm r1!, {r3,r4,r6}
@@ -22501,7 +22501,7 @@ _08014FE8:
 	strb r0, [r7, 0xD]
 	ldrb r0, [r7, 0xB]
 	bl sub_8018784
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	adds r2, r0, 0
 	ldr r1, =gUnknown_082F0204
 	ldm r1!, {r3-r5}
@@ -22549,7 +22549,7 @@ _080150CE:
 	b _080152A0
 _080150D6:
 	ldrb r0, [r7, 0xE]
-	bl ListMenuHandleInput
+	bl ListMenuHandleInputGetItemId
 	adds r2, r0, 0
 	ldr r0, =gMain
 	ldrh r1, [r0, 0x2E]
@@ -22874,7 +22874,7 @@ _08015398:
 	strb r0, [r5, 0xB]
 	ldrb r0, [r5, 0xB]
 	bl sub_8018784
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	adds r2, r0, 0
 	ldr r1, =gUnknown_082F0204
 	ldm r1!, {r3,r4,r6}
@@ -22920,7 +22920,7 @@ _08015446:
 	cmp r0, 0
 	beq _08015452
 	ldrb r0, [r5, 0xE]
-	bl ListMenuHandleInput
+	bl ListMenuHandleInputGetItemId
 _08015452:
 	ldrb r0, [r5, 0x14]
 	cmp r0, 0x78
@@ -26142,7 +26142,7 @@ _080170E0:
 	negs r0, r0
 	b _08017110
 _080170F2:
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	movs r2, 0x80
@@ -26270,7 +26270,7 @@ _080171DC:
 	ldrb r0, [r5]
 	movs r1, 0
 	bl sub_81973FC
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	adds r2, r0, 0
 	ldr r1, [sp, 0x24]
 	ldm r1!, {r3,r4,r6}
@@ -26295,7 +26295,7 @@ _080171DC:
 _08017228:
 	mov r3, r9
 	ldrb r0, [r3]
-	bl ListMenuHandleInput
+	bl ListMenuHandleInputGetItemId
 	mov r8, r0
 	ldr r0, =gMain
 	ldrh r1, [r0, 0x2E]
@@ -26383,7 +26383,7 @@ _080172C8:
 	ldrb r0, [r6]
 	movs r1, 0
 	bl sub_81973FC
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	adds r2, r0, 0
 	ldr r1, [sp, 0x24]
 	ldm r1!, {r3,r4,r7}
@@ -26411,7 +26411,7 @@ _08017314:
 _0801731C:
 	mov r3, r10
 	ldrb r0, [r3]
-	bl ListMenuHandleInput
+	bl ListMenuHandleInputGetItemId
 	adds r1, r0, 0
 	ldr r0, =gMain
 	ldrh r2, [r0, 0x2E]
@@ -29500,7 +29500,7 @@ _08018BD6:
 	b _08018C3E
 	.pool
 _08018BE4:
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r6, r0, 24
 	movs r1, 0x80
@@ -52112,7 +52112,7 @@ _0802426A:
 	bl sub_8197930
 	b _080242D0
 _08024270:
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r4, r0, 24
 	movs r0, 0x2
@@ -71033,7 +71033,7 @@ _0802DA84:
 	thumb_func_start sub_802DA8C
 sub_802DA8C: @ 802DA8C
 	push {lr}
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r0, 24
 	pop {r1}

asm/list_menu.s

@@ -64,7 +64,7 @@ _081AE4B0:
 	ldr r1, [sp, 0x4]
 	bl sub_8098858
 _081AE4C0:
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	adds r2, r0, 0
 	ldr r1, [sp]
 	ldm r1!, {r3-r5}
@@ -87,7 +87,7 @@ _081AE4C0:
 	.pool
 _081AE4F4:
 	ldrb r0, [r5, 0x6]
-	bl ListMenuHandleInput
+	bl ListMenuHandleInputGetItemId
 	str r0, [r5]
 	ldr r1, =gMain
 	ldrh r0, [r1, 0x2E]
@@ -227,9 +227,9 @@ _081AE5F0:
 	bx r1
 	thumb_func_end Unused_ListMenuInit2
 
-	thumb_func_start ListMenuHandleInput
+	thumb_func_start ListMenuHandleInputGetItemId
-@ int ListMenuHandleInput(u8 taskId)
+@ int ListMenuHandleInputGetItemId(u8 taskId)
-ListMenuHandleInput: @ 81AE604
+ListMenuHandleInputGetItemId: @ 81AE604
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -337,7 +337,7 @@ _081AE6BE:
 _081AE6C2:
 	pop {r1}
 	bx r1
-	thumb_func_end ListMenuHandleInput
+	thumb_func_end ListMenuHandleInputGetItemId
 
 	thumb_func_start sub_81AE6C8
 sub_81AE6C8: @ 81AE6C8
@@ -557,8 +557,8 @@ _081AE856:
 	.pool
 	thumb_func_end sub_81AE838
 
-	thumb_func_start get_coro_args_x18_x1A
+	thumb_func_start sub_81AE860
-get_coro_args_x18_x1A: @ 81AE860
+sub_81AE860: @ 81AE860
 	push {lr}
 	adds r3, r1, 0
 	lsls r0, 24
@@ -581,7 +581,7 @@ _081AE882:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end get_coro_args_x18_x1A
+	thumb_func_end sub_81AE860
 
 	thumb_func_start ListMenuGetYCoordForPrintingArrowCursor
 @ u8 ListMenuGetYCoordForPrintingArrowCursor(u8 taskId)

asm/macros/event.inc

@@ -226,6 +226,18 @@
 	.2byte \var2
 	.endm
 
+	@ Generic compare macro which attempts to deduce argument types based on their values
+	@ Any values between 0x4000 to 0x4FFF and 0x8000 to 0x8FFF are considered event variable identifiers
+	.macro compare arg1, arg2
+		.if ((\arg1 >> 12) == 4 || (\arg1 >> 12) == 8) && ((\arg2 >> 12) == 4 || (\arg2 >> 12) == 8)
+			compare_var_to_var \arg1, \arg2
+		.elseif ((\arg1 >> 12) == 4 || (\arg1 >> 12) == 8) && (\arg2 >= 0 && \arg2 <= 0xFFFF)
+			compare_var_to_value \arg1, \arg2
+		.else
+			.error "Invalid arguments for 'compare'"
+		.endif
+	.endm
+
 	@ Calls the native C function stored at `func`.
 	.macro callnative func
 	.byte 0x23
@@ -518,57 +530,58 @@
 	.endm
 
 	@ Applies the movement data at movements to the specified (index) Object. Also closes any standard message boxes that are still open.
-	.macro applymovement index, movements
+	@ If no map is specified, then the current map is used.
-	.byte 0x4f
+	.macro applymovement index, movements, map
-	.2byte \index
+		.ifb \map
-	.4byte \movements
+			.byte 0x4f
-	.endm
+			.2byte \index
-
+			.4byte \movements
-	@ Applies the movement data at movements to the specified (index) Object on the specified (map_group, map_num) map. Really only useful if the object has followed from one map to another (e.g. Wally during the catching event).
+		.else
-	.macro applymovementat variable, movements, map
+			@ Really only useful if the object has followed from one map to another (e.g. Wally during the catching event).
-	.byte 0x50
+			.byte 0x50
-	.2byte \variable
+			.2byte \index
-	.4byte \movements
+			.4byte \movements
-	map \map
+			map \map
+		.endif
 	.endm
 
 	@ Blocks script execution until the movements being applied to the specified (index) Object finish. If the specified Object is 0x0000, then the command will block script execution until all Objects affected by applymovement finish their movements. If the specified Object is not currently being manipulated with applymovement, then this command does nothing.
-	.macro waitmovement index
+	@ If no map is specified, then the current map is used.
-	.byte 0x51
+	.macro waitmovement index, map
-	.2byte \index
+		.ifb \map
-	.endm
+			.byte 0x51
-
+			.2byte \index
-	@ Blocks script execution until the movements being applied to the specified (index) Object on the specified (map) map finish.
+		.else
-	.macro waitmovementat index, map
+			.byte 0x52
-	.byte 0x52
+			.2byte \index
-	.2byte \index
+			map \map
-	map \map
+		.endif
-	.endm
-
-	@ Attempts to hide the specified (index) Object on the current map, by setting its visibility flag if it has a valid one. If the Object does not have a valid visibility flag, this command does nothing.
-	.macro removeobject index
-	.byte 0x53
-	.2byte \index
 	.endm
 
 	@ Attempts to hide the specified (index) Object on the specified (map_group, map_num) map, by setting its visibility flag if it has a valid one. If the Object does not have a valid visibility flag, this command does nothing.
-	.macro removeobjectat index, map
+	@ If no map is specified, then the current map is used.
-	.byte 0x54
+	.macro removeobject index, map
-	.2byte \index
+		.ifb \map
-	map \map
+			.byte 0x53
-	.endm
+			.2byte \index
-
+		.else
-	@ Unsets the specified (index) Object's visibility flag on the current map if it has a valid one. If the Object does not have a valid visibility flag, this command does nothing.
+			.byte 0x54
-	.macro addobject index
+			.2byte \index
-	.byte 0x55
+			map \map
-	.2byte \index
+		.endif
 	.endm
 
 	@ Unsets the specified (index) Object's visibility flag on the specified (map_group, map_num) map if it has a valid one. If the Object does not have a valid visibility flag, this command does nothing.
-	.macro addobjectat index, map
+	@ If no map is specified, then the current map is used.
-	.byte 0x56
+	.macro addobject index, map
-	.2byte \index
+		.ifb \map
-	map \map
+			.byte 0x55
+			.2byte \index
+		.else
+			.byte 0x56
+			.2byte \index
+			map \map
+		.endif
 	.endm
 
 	@ Sets the specified (index) Object's position on the current map.
@@ -663,11 +676,13 @@
 	.byte 0x5d
 	.endm
 
-	.macro ontrainerbattleend 
+	@ Goes to address after the trainerbattle command (called by the battle functions, see battle_setup.c)
+	.macro gotopostbattlescript 
 	.byte 0x5e
 	.endm
 
-	.macro ontrainerbattleendgoto 
+	@ Goes to address specified in the trainerbattle command (called by the battle functions, see battle_setup.c)
+	.macro gotobeatenscript 
 	.byte 0x5f
 	.endm
 
@@ -848,11 +863,11 @@
 	.2byte \species
 	.endm
 
-	.macro setmonmove byte1, byte2, word
+	.macro setmonmove index, slot, move
 	.byte 0x7b
-	.byte \byte1
+	.byte \index
-	.byte \byte2
+	.byte \slot
-	.2byte \word
+	.2byte \move
 	.endm
 
 	@ Checks if at least one Pokemon in the player's party knows the specified (index) attack. If so, variable 0x800D (LASTRESULT) is set to the (zero-indexed) slot number of the first Pokemon that knows the move. If not, LASTRESULT is set to 0x0006. Variable 0x8004 is also set to this Pokemon's species.
@@ -956,7 +971,7 @@
 	.endm
 
 	@ This allows you to choose a Pokemon to use in a contest. In FireRed, this command sets the byte at 0x03000EA8 to 0x01.
-	.macro choosecontestpkmn 
+	.macro choosecontestmon 
 	.byte 0x8b
 	.endm
 
@@ -1022,10 +1037,10 @@
 	.byte \y
 	.endm
 
-	@ Gets the price reduction for the index (word) given. In FireRed, this command is a nop.
+	@ Gets the price reduction for the index given. In FireRed, this command is a nop.
-	.macro getpricereduction word
+	.macro getpricereduction index
 	.byte 0x96
-	.2byte \word
+	.2byte \index
 	.endm
 
 	@ Fades the screen to and from black and white. Mode 0x00 fades from black, mode 0x01 fades out to black, mode 0x2 fades in from white, and mode 0x3 fades out to white.
@@ -1076,9 +1091,9 @@
 	.endm
 
 	@ Sets which healing place the player will return to if all of the Pokemon in their party faint.
-	.macro setrespawn flightspot
+	.macro setrespawn heallocation
 	.byte 0x9f
-	.2byte \flightspot
+	.2byte \heallocation
 	.endm
 
 	@ Checks the player's gender. If male, then 0x0000 is stored in variable 0x800D (LASTRESULT). If female, then 0x0001 is stored in LASTRESULT.
@@ -1185,7 +1200,7 @@
 	.endm
 
 	@ Sets the door tile at (x, y) to be closed without an animation.
-	.macro setdoorclosed2 x, y
+	.macro setdoorclosed x, y
 	.byte 0xb0
 	.2byte \x
 	.2byte \y
@@ -1215,9 +1230,9 @@
 	.2byte \count
 	.endm
 
-	.macro takecoins word
+	.macro takecoins count
 	.byte 0xb5
-	.2byte \word
+	.2byte \count
 	.endm
 
 	@ Prepares to start a wild battle against a species at Level level holding item. Running this command will not affect normal wild battles. You start the prepared battle with dowildbattle.
@@ -1233,10 +1248,9 @@
 	.byte 0xb7
 	.endm
 
-	.macro setvaddress long, word
+	.macro setvaddress pointer
 	.byte 0xb8
-	.4byte \long
+	.4byte \pointer
-	.2byte \word
 	.endm
 
 	.macro vgoto pointer

asm/mail_data.s

@@ -1,589 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start ClearMailData
-ClearMailData: @ 80D436C
-	push {r4,r5,lr}
-	movs r4, 0
-	ldr r5, =gSaveBlock1Ptr
-_080D4372:
-	lsls r1, r4, 3
-	adds r1, r4
-	lsls r1, 2
-	ldr r0, =0x00002be0
-	adds r1, r0
-	ldr r0, [r5]
-	adds r0, r1
-	bl ClearMailStruct
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0xF
-	bls _080D4372
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end ClearMailData
-
-	thumb_func_start ClearMailStruct
-ClearMailStruct: @ 80D439C
-	push {r4-r6,lr}
-	adds r3, r0, 0
-	ldr r0, =0x0000ffff
-	adds r4, r0, 0
-	adds r1, r3, 0
-	movs r2, 0x8
-_080D43A8:
-	ldrh r0, [r1]
-	orrs r0, r4
-	strh r0, [r1]
-	adds r1, 0x2
-	subs r2, 0x1
-	cmp r2, 0
-	bge _080D43A8
-	movs r2, 0
-	adds r6, r3, 0
-	adds r6, 0x1A
-	adds r4, r3, 0
-	adds r4, 0x12
-	movs r5, 0xFF
-_080D43C2:
-	adds r1, r4, r2
-	ldrb r0, [r1]
-	orrs r0, r5
-	strb r0, [r1]
-	adds r2, 0x1
-	cmp r2, 0x7
-	ble _080D43C2
-	adds r1, r6, 0
-	movs r2, 0
-	adds r0, r1, 0x3
-_080D43D6:
-	strb r2, [r0]
-	subs r0, 0x1
-	cmp r0, r1
-	bge _080D43D6
-	movs r1, 0
-	movs r0, 0x1
-	strh r0, [r3, 0x1E]
-	strh r1, [r3, 0x20]
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end ClearMailStruct
-
-	thumb_func_start MonHasMail
-MonHasMail: @ 80D43F0
-	push {r4,lr}
-	adds r4, r0, 0
-	movs r1, 0xC
-	bl GetMonData
-	lsls r0, 16
-	lsrs r0, 16
-	bl itemid_is_mail
-	lsls r0, 24
-	cmp r0, 0
-	beq _080D4418
-	adds r0, r4, 0
-	movs r1, 0x40
-	bl GetMonData
-	cmp r0, 0xFF
-	beq _080D4418
-	movs r0, 0x1
-	b _080D441A
-_080D4418:
-	movs r0, 0
-_080D441A:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end MonHasMail
-
-	thumb_func_start sub_80D4420
-sub_80D4420: @ 80D4420
-	push {r4-r7,lr}
-	mov r7, r10
-	mov r6, r9
-	mov r5, r8
-	push {r5-r7}
-	sub sp, 0xC
-	mov r8, r0
-	lsls r1, 16
-	lsrs r0, r1, 16
-	str r0, [sp, 0x8]
-	mov r0, sp
-	movs r2, 0
-	ldrb r3, [r0, 0x8]
-	strb r3, [r0]
-	lsrs r1, 24
-	strb r1, [r0, 0x1]
-	add r3, sp, 0x4
-	strb r2, [r3]
-	ldr r4, =gSaveBlock1Ptr
-	mov r10, r4
-	mov r9, r3
-	adds r4, r3, 0
-_080D444C:
-	mov r1, r10
-	ldr r0, [r1]
-	ldrb r2, [r4]
-	lsls r1, r2, 3
-	adds r1, r2
-	lsls r1, 2
-	adds r0, r1
-	movs r1, 0xB0
-	lsls r1, 6
-	adds r0, r1
-	ldrh r0, [r0]
-	cmp r0, 0
-	beq _080D4468
-	b _080D45A8
-_080D4468:
-	movs r4, 0
-	ldr r2, =gSaveBlock2Ptr
-	mov r12, r2
-	ldr r7, =gSaveBlock1Ptr
-	add r5, sp, 0x4
-	ldr r3, =0x0000ffff
-	adds r6, r3, 0
-_080D4476:
-	ldr r2, [r7]
-	lsls r3, r4, 1
-	ldrb r1, [r5]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r3, r0
-	ldr r0, =0x00002be0
-	adds r2, r0
-	adds r2, r3
-	ldrh r0, [r2]
-	orrs r0, r6
-	strh r0, [r2]
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x8
-	bls _080D4476
-	movs r4, 0
-	ldr r5, =gSaveBlock1Ptr
-	add r3, sp, 0x4
-_080D44A0:
-	ldr r2, [r5]
-	ldrb r1, [r3]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4, r0
-	ldr r1, =0x00002bf2
-	adds r2, r1
-	adds r2, r0
-	mov r1, r12
-	ldr r0, [r1]
-	adds r0, r4
-	ldrb r0, [r0]
-	strb r0, [r2]
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x6
-	bls _080D44A0
-	mov r3, r10
-	ldr r2, [r3]
-	mov r0, r9
-	ldrb r1, [r0]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4, r0
-	ldr r1, =0x00002bf2
-	adds r2, r1
-	adds r2, r0
-	movs r0, 0xFF
-	strb r0, [r2]
-	mov r2, r9
-	ldrb r1, [r2]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	ldr r1, [r3]
-	adds r0, r1
-	ldr r3, =0x00002bf2
-	adds r0, r3
-	movs r1, 0
-	bl sub_81DB4DC
-	movs r4, 0
-	ldr r6, =gSaveBlock1Ptr
-	add r3, sp, 0x4
-	ldr r5, =gSaveBlock2Ptr
-_080D4500:
-	ldr r2, [r6]
-	ldrb r1, [r3]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r0, r4, r0
-	ldr r1, =0x00002bfa
-	adds r2, r1
-	adds r2, r0
-	ldr r0, [r5]
-	adds r0, 0xA
-	adds r0, r4
-	ldrb r0, [r0]
-	strb r0, [r2]
-	adds r0, r4, 0x1
-	lsls r0, 24
-	lsrs r4, r0, 24
-	cmp r4, 0x3
-	bls _080D4500
-	mov r0, r8
-	movs r1, 0xB
-	bl GetBoxMonData
-	adds r4, r0, 0
-	lsls r4, 16
-	lsrs r4, 16
-	mov r0, r8
-	movs r1, 0
-	bl GetBoxMonData
-	adds r1, r0, 0
-	adds r0, r4, 0
-	bl sub_80D45C8
-	mov r2, r10
-	ldr r3, [r2]
-	mov r4, r9
-	ldrb r2, [r4]
-	lsls r1, r2, 3
-	adds r1, r2
-	lsls r1, 2
-	adds r1, r3, r1
-	ldr r2, =0x00002bfe
-	adds r1, r2
-	strh r0, [r1]
-	ldrb r1, [r4]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r3, r0
-	movs r4, 0xB0
-	lsls r4, 6
-	adds r3, r4
-	mov r0, sp
-	ldrh r0, [r0, 0x8]
-	strh r0, [r3]
-	mov r0, r8
-	movs r1, 0x40
-	mov r2, r9
-	bl SetMonData
-	mov r0, r8
-	movs r1, 0xC
-	mov r2, sp
-	bl SetMonData
-	mov r1, r9
-	ldrb r0, [r1]
-	b _080D45B6
-	.pool
-_080D45A8:
-	adds r0, r2, 0x1
-	strb r0, [r3]
-	ldrb r0, [r4]
-	cmp r0, 0x5
-	bhi _080D45B4
-	b _080D444C
-_080D45B4:
-	movs r0, 0xFF
-_080D45B6:
-	add sp, 0xC
-	pop {r3-r5}
-	mov r8, r3
-	mov r9, r4
-	mov r10, r5
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80D4420
-
-	thumb_func_start sub_80D45C8
-sub_80D45C8: @ 80D45C8
-	push {lr}
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0xC9
-	bne _080D45E0
-	adds r0, r1, 0
-	bl mon_icon_personality_to_unown_id
-	lsls r0, 16
-	ldr r1, =0x75300000
-	adds r0, r1
-	lsrs r0, 16
-_080D45E0:
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_80D45C8
-
-	thumb_func_start sub_80D45E8
-sub_80D45E8: @ 80D45E8
-	push {lr}
-	lsls r0, 16
-	lsrs r3, r0, 16
-	ldr r0, =0xffff8ad0
-	adds r2, r3, r0
-	lsls r0, r2, 16
-	lsrs r0, 16
-	cmp r0, 0x1B
-	bhi _080D4604
-	movs r0, 0xC9
-	strh r2, [r1]
-	b _080D4606
-	.pool
-_080D4604:
-	adds r0, r3, 0
-_080D4606:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80D45E8
-
-	thumb_func_start GiveMailToMon2
-GiveMailToMon2: @ 80D460C
-	push {r4-r7,lr}
-	sub sp, 0x8
-	adds r6, r0, 0
-	adds r7, r1, 0
-	ldrh r5, [r7, 0x20]
-	adds r1, r5, 0
-	bl sub_80D4420
-	add r4, sp, 0x4
-	strb r0, [r4]
-	ldrb r2, [r4]
-	cmp r2, 0xFF
-	beq _080D4670
-	ldr r0, =gSaveBlock1Ptr
-	ldr r1, [r0]
-	lsls r0, r2, 3
-	adds r0, r2
-	lsls r0, 2
-	adds r1, r0
-	ldr r0, =0x00002be0
-	adds r1, r0
-	adds r0, r7, 0
-	ldm r0!, {r2,r3,r7}
-	stm r1!, {r2,r3,r7}
-	ldm r0!, {r2,r3,r7}
-	stm r1!, {r2,r3,r7}
-	ldm r0!, {r2,r3,r7}
-	stm r1!, {r2,r3,r7}
-	adds r0, r6, 0
-	movs r1, 0x40
-	adds r2, r4, 0
-	bl SetMonData
-	mov r0, sp
-	strb r5, [r0]
-	mov r1, sp
-	lsrs r0, r5, 8
-	strb r0, [r1, 0x1]
-	adds r0, r6, 0
-	movs r1, 0xC
-	mov r2, sp
-	bl SetMonData
-	ldrb r0, [r4]
-	b _080D4672
-	.pool
-_080D4670:
-	movs r0, 0xFF
-_080D4672:
-	add sp, 0x8
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end GiveMailToMon2
-
-	thumb_func_start sub_80D467C
-sub_80D467C: @ 80D467C
-	movs r0, 0
-	bx lr
-	thumb_func_end sub_80D467C
-
-	thumb_func_start TakeMailFromMon
-TakeMailFromMon: @ 80D4680
-	push {r4,lr}
-	sub sp, 0x8
-	adds r4, r0, 0
-	bl MonHasMail
-	lsls r0, 24
-	cmp r0, 0
-	beq _080D46D2
-	adds r0, r4, 0
-	movs r1, 0x40
-	bl GetMonData
-	add r2, sp, 0x4
-	strb r0, [r2]
-	ldr r0, =gSaveBlock1Ptr
-	ldr r3, [r0]
-	ldrb r1, [r2]
-	lsls r0, r1, 3
-	adds r0, r1
-	lsls r0, 2
-	adds r3, r0
-	movs r0, 0xB0
-	lsls r0, 6
-	adds r3, r0
-	movs r1, 0
-	movs r0, 0
-	strh r0, [r3]
-	movs r0, 0xFF
-	strb r0, [r2]
-	mov r0, sp
-	strb r1, [r0]
-	strb r1, [r0, 0x1]
-	adds r0, r4, 0
-	movs r1, 0x40
-	bl SetMonData
-	adds r0, r4, 0
-	movs r1, 0xC
-	mov r2, sp
-	bl SetMonData
-_080D46D2:
-	add sp, 0x8
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end TakeMailFromMon
-
-	thumb_func_start sub_80D46E0
-sub_80D46E0: @ 80D46E0
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r1, =gSaveBlock1Ptr
-	ldr r2, [r1]
-	lsls r1, r0, 3
-	adds r1, r0
-	lsls r1, 2
-	adds r2, r1
-	movs r0, 0xB0
-	lsls r0, 6
-	adds r2, r0
-	movs r0, 0
-	strh r0, [r2]
-	bx lr
-	.pool
-	thumb_func_end sub_80D46E0
-
-	thumb_func_start sub_80D4700
-sub_80D4700: @ 80D4700
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	sub sp, 0xC
-	adds r5, r0, 0
-	mov r0, sp
-	movs r1, 0
-	strb r1, [r0]
-	strb r1, [r0, 0x1]
-	add r1, sp, 0x4
-	movs r0, 0xFF
-	strb r0, [r1]
-	movs r7, 0x6
-	mov r9, r1
-	ldr r0, =gSaveBlock1Ptr
-	mov r8, r0
-	ldr r3, =0x00002be0
-_080D4724:
-	mov r1, r8
-	ldr r0, [r1]
-	lsls r1, r7, 3
-	adds r1, r7
-	lsls r1, 2
-	adds r4, r0, r1
-	movs r2, 0xB0
-	lsls r2, 6
-	adds r0, r4, r2
-	ldrh r6, [r0]
-	cmp r6, 0
-	bne _080D47A0
-	adds r4, r3
-	adds r0, r5, 0
-	movs r1, 0x40
-	str r3, [sp, 0x8]
-	bl GetMonData
-	mov r1, r8
-	ldr r2, [r1]
-	lsls r1, r0, 3
-	adds r1, r0
-	lsls r1, 2
-	adds r1, r2
-	ldr r3, [sp, 0x8]
-	adds r1, r3
-	ldm r1!, {r0,r2,r3}
-	stm r4!, {r0,r2,r3}
-	ldm r1!, {r0,r2,r3}
-	stm r4!, {r0,r2,r3}
-	ldm r1!, {r0,r2,r3}
-	stm r4!, {r0,r2,r3}
-	adds r0, r5, 0
-	movs r1, 0x40
-	bl GetMonData
-	mov r1, r8
-	ldr r2, [r1]
-	lsls r1, r0, 3
-	adds r1, r0
-	lsls r1, 2
-	adds r2, r1
-	movs r3, 0xB0
-	lsls r3, 6
-	adds r2, r3
-	strh r6, [r2]
-	adds r0, r5, 0
-	movs r1, 0x40
-	mov r2, r9
-	bl SetMonData
-	adds r0, r5, 0
-	movs r1, 0xC
-	mov r2, sp
-	bl SetMonData
-	adds r0, r7, 0
-	b _080D47AC
-	.pool
-_080D47A0:
-	adds r0, r7, 0x1
-	lsls r0, 24
-	lsrs r7, r0, 24
-	cmp r7, 0xF
-	bls _080D4724
-	movs r0, 0xFF
-_080D47AC:
-	add sp, 0xC
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_80D4700
-
-	thumb_func_start itemid_is_mail
-itemid_is_mail: @ 80D47BC
-	push {lr}
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r0, 0x84
-	bgt _080D47CE
-	cmp r0, 0x79
-	blt _080D47CE
-	movs r0, 0x1
-	b _080D47D0
-_080D47CE:
-	movs r0, 0
-_080D47D0:
-	pop {r1}
-	bx r1
-	thumb_func_end itemid_is_mail
-
-	.align 2, 0 @ Don't pad with nop.

asm/main_menu.s

@@ -3025,7 +3025,7 @@ task_new_game_prof_birch_speech_part2_4: @ 8031188
 	push {r4,r5,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0

asm/map_obj_8097404.s

@@ -82,9 +82,9 @@ _0809748E:
 	bx r1
 	thumb_func_end sub_8097404
 
-	thumb_func_start player_bitmagic
+	thumb_func_start FreezeMapObjects
-@ void player_bitmagic()
+@ void FreezeMapObjects()
-player_bitmagic: @ 8097494
+FreezeMapObjects: @ 8097494
 	push {r4,r5,lr}
 	movs r4, 0
 	ldr r5, =gMapObjects
@@ -113,7 +113,7 @@ _080974B8:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end player_bitmagic
+	thumb_func_end FreezeMapObjects
 
 	thumb_func_start sub_80974D0
 sub_80974D0: @ 80974D0

asm/map_obj_lock.s

@@ -62,7 +62,7 @@ _080983E2:
 	thumb_func_start ScriptFreezeMapObjects
 ScriptFreezeMapObjects: @ 80983E8
 	push {lr}
-	bl player_bitmagic
+	bl FreezeMapObjects
 	ldr r0, =sub_80983A4
 	movs r1, 0x50
 	bl CreateTask
@@ -345,15 +345,15 @@ sub_8098630: @ 8098630
 	mov r6, r8
 	push {r6,r7}
 	movs r0, 0
-	bl sub_80B47E0
+	bl GetChosenApproachingTrainerMapObjectId
 	lsls r0, 24
 	lsrs r4, r0, 24
-	ldr r0, =gUnknown_030060A8
+	ldr r0, =gNoOfApproachingTrainers
 	ldrb r0, [r0]
 	cmp r0, 0x2
 	bne _080986E0
 	movs r0, 0x1
-	bl sub_80B47E0
+	bl GetChosenApproachingTrainerMapObjectId
 	lsls r0, 24
 	lsrs r0, 24
 	adds r5, r0, 0

asm/menu.s

@@ -2266,8 +2266,8 @@ sub_8198C34: @ 8198C34
 	bx r0
 	thumb_func_end sub_8198C34
 
-	thumb_func_start sub_8198C58
+	thumb_func_start ProcessMenuInputNoWrap_
-sub_8198C58: @ 8198C58
+ProcessMenuInputNoWrap_: @ 8198C58
 	push {r4,lr}
 	bl ProcessMenuInputNoWrapAround
 	lsls r0, 24
@@ -2282,7 +2282,7 @@ _08198C6E:
 	pop {r4}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_8198C58
+	thumb_func_end ProcessMenuInputNoWrap_
 
 	thumb_func_start sub_8198C78
 sub_8198C78: @ 8198C78

asm/menu_helpers.s

@@ -5,8 +5,8 @@
 
 	.text
 
-	thumb_func_start sub_8121DA0
+	thumb_func_start ResetVramOamAndBgCntRegs
-sub_8121DA0: @ 8121DA0
+ResetVramOamAndBgCntRegs: @ 8121DA0
 	push {r4,lr}
 	sub sp, 0xC
 	movs r0, 0
@@ -50,10 +50,10 @@ sub_8121DA0: @ 8121DA0
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_8121DA0
+	thumb_func_end ResetVramOamAndBgCntRegs
 
-	thumb_func_start sub_8121E10
+	thumb_func_start ResetAllBgsCoordinates
-sub_8121E10: @ 8121E10
+ResetAllBgsCoordinates: @ 8121E10
 	push {lr}
 	movs r0, 0
 	movs r1, 0
@@ -89,7 +89,7 @@ sub_8121E10: @ 8121E10
 	bl ChangeBgY
 	pop {r0}
 	bx r0
-	thumb_func_end sub_8121E10
+	thumb_func_end ResetAllBgsCoordinates
 
 	thumb_func_start SetVBlankHBlankCallbacksToNull
 @ void SetVBlankHBlankCallbacksToNull()
@@ -177,8 +177,8 @@ _08121EC0:
 	.pool
 	thumb_func_end DisplayMessageAndContinueTask
 
-	thumb_func_start sub_8121F20
+	thumb_func_start RunTextPrintersRetIsActive
-sub_8121F20: @ 8121F20
+RunTextPrintersRetIsActive: @ 8121F20
 	push {r4,lr}
 	adds r4, r0, 0
 	lsls r4, 24
@@ -191,7 +191,7 @@ sub_8121F20: @ 8121F20
 	pop {r4}
 	pop {r1}
 	bx r1
-	thumb_func_end sub_8121F20
+	thumb_func_end RunTextPrintersRetIsActive
 
 	thumb_func_start Task_ContinueTaskAfterMessagePrints
 @ void Task_ContinueTaskAfterMessagePrints(u8 taskId)
@@ -201,7 +201,7 @@ Task_ContinueTaskAfterMessagePrints: @ 8121F3C
 	lsrs r4, r0, 24
 	ldr r0, =gUnknown_0203A140
 	ldrb r0, [r0]
-	bl sub_8121F20
+	bl RunTextPrintersRetIsActive
 	lsls r0, 16
 	cmp r0, 0
 	bne _08121F5A
@@ -277,7 +277,7 @@ Task_CallYesOrNoCallback: @ 8121FDC
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -512,7 +512,7 @@ itemid_80BF6D8_mail_related: @ 812217C
 	bne _081221A4
 _08122192:
 	adds r0, r4, 0
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -752,8 +752,8 @@ _08122322:
 	bx r0
 	thumb_func_end sub_8122298
 
-	thumb_func_start sub_8122328
+	thumb_func_start LoadListMenuArrowsGfx
-sub_8122328: @ 8122328
+LoadListMenuArrowsGfx: @ 8122328
 	push {lr}
 	ldr r0, =gUnknown_0859F514
 	bl LoadCompressedObjectPic
@@ -762,7 +762,7 @@ sub_8122328: @ 8122328
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_8122328
+	thumb_func_end LoadListMenuArrowsGfx
 
 	thumb_func_start sub_8122344
 sub_8122344: @ 8122344

asm/mystery_event_script.s

@@ -43,7 +43,7 @@ _081537FE:
 sub_8153804: @ 8153804
 	push {lr}
 	ldr r0, =gStringVar4
-	ldr r1, =gUnknown_08674C86
+	ldr r1, =gText_MysteryGiftCantBeUsed
 	bl StringExpandPlaceholders
 	movs r0, 0x3
 	bl SetMysteryEventScriptStatus
@@ -461,7 +461,7 @@ sub_8153AE8: @ 8153AE8
 	cmp r0, 0
 	bne _08153B54
 	ldr r0, =gStringVar4
-	ldr r1, =gUnknown_08674AE4
+	ldr r1, =gText_MysteryGiftBerry
 	b _08153B74
 	.pool
 _08153B54:
@@ -471,12 +471,12 @@ _08153B54:
 	cmp r0, 0
 	beq _08153B70
 	ldr r0, =gStringVar4
-	ldr r1, =gUnknown_08674B16
+	ldr r1, =gText_MysteryGiftBerryTransform
 	b _08153B74
 	.pool
 _08153B70:
 	ldr r0, =gStringVar4
-	ldr r1, =gUnknown_08674B42
+	ldr r1, =gText_MysteryGiftBerryObtained
 _08153B74:
 	bl StringExpandPlaceholders
 	movs r0, 0x2
@@ -515,7 +515,7 @@ sub_8153BB0: @ 8153BB0
 	str r2, [r4, 0x8]
 	bl GiveGiftRibbonToParty
 	ldr r0, =gStringVar4
-	ldr r1, =gUnknown_08674B6A
+	ldr r1, =gText_MysteryGiftSpecialRibbon
 	bl StringExpandPlaceholders
 	movs r0, 0x2
 	str r0, [r4, 0x6C]
@@ -584,7 +584,7 @@ sub_8153C4C: @ 8153C4C
 	adds r4, r0, 0
 	bl EnableNationalPokedex
 	ldr r0, =gStringVar4
-	ldr r1, =gUnknown_08674B9E
+	ldr r1, =gText_MysteryGiftNationalDex
 	bl StringExpandPlaceholders
 	movs r0, 0x2
 	str r0, [r4, 0x6C]
@@ -605,7 +605,7 @@ sub_8153C70: @ 8153C70
 	str r1, [r4, 0x8]
 	bl sub_811EFC0
 	ldr r0, =gStringVar4
-	ldr r1, =gUnknown_08674BD4
+	ldr r1, =gText_MysteryGiftRareWord
 	bl StringExpandPlaceholders
 	movs r0, 0x2
 	str r0, [r4, 0x6C]
@@ -685,7 +685,7 @@ _08153D22:
 	cmp r0, 0x6
 	bne _08153D4C
 	ldr r0, =gStringVar4
-	ldr r1, =gUnknown_08674C02
+	ldr r1, =gText_MysteryGiftFullParty
 	bl StringExpandPlaceholders
 	movs r0, 0x3
 	b _08153DB6
@@ -721,7 +721,7 @@ _08153D86:
 	bl GetMonData
 	lsls r0, 16
 	lsrs r0, 16
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	beq _08153DA4
@@ -732,7 +732,7 @@ _08153DA4:
 	bl CompactPartySlots
 	bl CalculatePlayerPartyCount
 	ldr r0, =gStringVar4
-	ldr r1, =gUnknown_08674BF0
+	ldr r1, =gText_MysteryGiftSentOver
 	bl StringExpandPlaceholders
 	movs r0, 0x2
 _08153DB6:
@@ -765,7 +765,7 @@ sub_8153DD4: @ 8153DD4
 	bl memcpy
 	bl sub_81652B4
 	ldr r0, =gStringVar4
-	ldr r1, =gUnknown_08674C31
+	ldr r1, =gText_MysteryGiftNewTrainer
 	bl StringExpandPlaceholders
 	movs r0, 0x2
 	str r0, [r4, 0x6C]

asm/overworld.s

@@ -21,7 +21,7 @@ sub_8084620: @ 8084620
 	lsrs r1, 1
 	adds r0, r4, 0
 	bl SetMoney
-	bl sp000_heal_pokemon
+	bl HealPlayerParty
 	bl sub_8084720
 	bl copy_saved_warp3_bank_and_enter_x_to_warp1
 	bl warp_in
@@ -1381,12 +1381,12 @@ _080850C8:
 	bl prev_quest_postbuffer_cursor_backup_reset
 	adds r0, r6, 0
 	adds r1, r5, 0
-	bl sub_80B21B4
+	bl TryUpdateRandomTrainerRematches
 	bl DoTimeBasedEvents
 	bl sub_80AEDBC
 	bl sub_8085B2C
 	bl update_sav1_flash_used_on_map
-	bl sav1_reset_battle_music_maybe
+	bl Overworld_ClearSavedMusic
 	bl mapheader_run_script_with_tag_x3
 	bl not_trainer_hill_battle_pyramid
 	ldr r0, [r4]
@@ -1478,7 +1478,7 @@ _080851A2:
 	asrs r1, 24
 	lsls r1, 16
 	lsrs r1, 16
-	bl sub_80B21B4
+	bl TryUpdateRandomTrainerRematches
 	cmp r7, 0x1
 	beq _080851EE
 	bl DoTimeBasedEvents
@@ -1491,7 +1491,7 @@ _080851EE:
 	bl FlagClear
 _08085200:
 	bl update_sav1_flash_used_on_map
-	bl sav1_reset_battle_music_maybe
+	bl Overworld_ClearSavedMusic
 	bl mapheader_run_script_with_tag_x3
 	bl UpdateLocationHistoryForRoamer
 	bl RoamerMoveToOtherLocationSet
@@ -1880,15 +1880,15 @@ _080854FE:
 	.pool
 	thumb_func_end Overworld_SetFlashLevel
 
-	thumb_func_start sav1_get_flash_used_on_map
+	thumb_func_start Overworld_GetFlashLevel
-sav1_get_flash_used_on_map: @ 8085514
+Overworld_GetFlashLevel: @ 8085514
 	ldr r0, =gSaveBlock1Ptr
 	ldr r0, [r0]
 	adds r0, 0x30
 	ldrb r0, [r0]
 	bx lr
 	.pool
-	thumb_func_end sav1_get_flash_used_on_map
+	thumb_func_end Overworld_GetFlashLevel
 
 	thumb_func_start sub_8085524
 sub_8085524: @ 8085524
@@ -2133,7 +2133,7 @@ sav1_map_get_music: @ 80856D4
 	lsls r0, 5
 	cmp r1, r0
 	bne _080856FC
-	bl sav1_get_weather_probably
+	bl GetSav1Weather
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x8
@@ -2272,15 +2272,15 @@ Overworld_SetSavedMusic: @ 80857F4
 	.pool
 	thumb_func_end Overworld_SetSavedMusic
 
-	thumb_func_start sav1_reset_battle_music_maybe
+	thumb_func_start Overworld_ClearSavedMusic
-sav1_reset_battle_music_maybe: @ 8085800
+Overworld_ClearSavedMusic: @ 8085800
 	ldr r0, =gSaveBlock1Ptr
 	ldr r1, [r0]
 	movs r0, 0
 	strh r0, [r1, 0x2C]
 	bx lr
 	.pool
-	thumb_func_end sav1_reset_battle_music_maybe
+	thumb_func_end Overworld_ClearSavedMusic
 
 	thumb_func_start sub_8085810
 sub_8085810: @ 8085810
@@ -2856,8 +2856,8 @@ sav1_map_get_name: @ 8085C58
 	.pool
 	thumb_func_end sav1_map_get_name
 
-	thumb_func_start sav1_map_get_battletype
+	thumb_func_start GetCurrentMapBattleScene
-sav1_map_get_battletype: @ 8085C80
+GetCurrentMapBattleScene: @ 8085C80
 	push {lr}
 	ldr r0, =gSaveBlock1Ptr
 	ldr r1, [r0]
@@ -2875,7 +2875,7 @@ sav1_map_get_battletype: @ 8085C80
 	pop {r1}
 	bx r1
 	.pool
-	thumb_func_end sav1_map_get_battletype
+	thumb_func_end GetCurrentMapBattleScene
 
 	thumb_func_start overworld_bg_setup
 @ void overworld_bg_setup()
@@ -3192,8 +3192,8 @@ CB2_NewGame: @ 8085EF8
 	.pool
 	thumb_func_end CB2_NewGame
 
-	thumb_func_start c2_whiteout
+	thumb_func_start CB2_WhiteOut
-c2_whiteout: @ 8085F58
+CB2_WhiteOut: @ 8085F58
 	push {lr}
 	sub sp, 0x4
 	ldr r1, =gMain
@@ -3232,7 +3232,7 @@ _08085FB0:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end c2_whiteout
+	thumb_func_end CB2_WhiteOut
 
 	thumb_func_start c2_load_new_map
 c2_load_new_map: @ 8085FCC
@@ -3661,7 +3661,7 @@ sub_80863B0: @ 80863B0
 	b _080863F0
 	.pool
 _080863D4:
-	bl sav1_get_flash_used_on_map
+	bl Overworld_GetFlashLevel
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0

asm/party_menu.s

@@ -98,7 +98,7 @@ _081B0234:
 	.4byte _081B0474
 _081B0290:
 	bl SetVBlankHBlankCallbacksToNull
-	bl sub_8121DA0
+	bl ResetVramOamAndBgCntRegs
 	bl clear_scheduled_bg_copies_to_vram
 	ldr r1, =gMain
 	movs r0, 0x87
@@ -429,7 +429,7 @@ sub_81B0550: @ 81B0550
 	ldr r1, [r5]
 	movs r0, 0x1
 	bl SetBgTilemapBuffer
-	bl sub_8121E10
+	bl ResetAllBgsCoordinates
 	movs r0, 0x1
 	bl schedule_bg_copy_tilemap_to_vram
 	movs r1, 0x82
@@ -2554,7 +2554,7 @@ sub_81B1708: @ 81B1708
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -3161,7 +3161,7 @@ sub_81B1B8C: @ 81B1B8C
 	lsrs r4, r0, 24
 	adds r5, r4, 0
 	movs r0, 0x6
-	bl sub_8121F20
+	bl RunTextPrintersRetIsActive
 	lsls r0, 16
 	lsrs r0, 16
 	cmp r0, 0x1
@@ -3402,14 +3402,14 @@ sub_81B1DB8: @ 81B1DB8
 	lsrs r4, r5, 16
 	adds r7, r4, 0
 	adds r0, r4, 0
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
 	bne _081B1DE2
 	adds r0, r6, 0
 	adds r1, r4, 0
-	bl sub_80D4420
+	bl GiveMailToMon
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0xFF
@@ -4010,7 +4010,7 @@ sub_81B227C: @ 81B227C
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -6216,7 +6216,7 @@ _081B34D2:
 	bl GetMonData
 	lsls r0, 16
 	lsrs r0, 16
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	beq _081B3508
@@ -7791,7 +7791,7 @@ _081B425A:
 	.pool
 _081B4278:
 	ldrh r0, [r6]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	beq _081B42A4
@@ -7952,7 +7952,7 @@ sub_81B43DC: @ 81B43DC
 	push {r4-r6,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -7999,7 +7999,7 @@ _081B4402:
 	.pool
 _081B4458:
 	ldrh r0, [r5]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	beq _081B4498
@@ -8485,7 +8485,7 @@ sub_81B48DC: @ 81B48DC
 	muls r1, r0
 	ldr r0, =gPlayerParty
 	adds r4, r1, r0
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -8681,7 +8681,7 @@ sub_81B4A98: @ 81B4A98
 	adds r0, r1
 	ldr r1, =sub_81B4AE0
 	movs r2, 0x1
-	bl sub_8121478
+	bl ReadMail
 	pop {r0}
 	bx r0
 	.pool
@@ -8777,7 +8777,7 @@ sub_81B4BA0: @ 81B4BA0
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -8801,7 +8801,7 @@ _081B4BC6:
 	muls r0, r1
 	ldr r1, =gPlayerParty
 	adds r0, r1
-	bl sub_80D4700
+	bl TakeMailFromMon2
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0xFF
@@ -8883,7 +8883,7 @@ sub_81B4C94: @ 81B4C94
 	push {r7}
 	lsls r0, 24
 	lsrs r5, r0, 24
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -9691,7 +9691,7 @@ sub_81B5430: @ 81B5430
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -9985,7 +9985,7 @@ sub_81B56D8: @ 81B56D8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -10735,7 +10735,7 @@ sub_81B5CB0: @ 81B5CB0
 	b _081B5D24
 	.pool
 _081B5CD8:
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	beq _081B5CFC
@@ -10821,7 +10821,7 @@ _081B5D68:
 	adds r0, r7, r5
 	ldrb r4, [r0]
 	adds r0, r1, 0
-	bl itemid_is_mail
+	bl ItemIsMail
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -10853,7 +10853,7 @@ _081B5DAC:
 	adds r0, r5, r7
 	ldrb r4, [r0, 0x6]
 	adds r0, r1, 0
-	bl itemid_is_mail
+	bl ItemIsMail
 	adds r1, r0, 0
 	lsls r1, 24
 	lsrs r1, 24
@@ -12970,7 +12970,7 @@ sub_81B7028: @ 81B7028
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -13272,7 +13272,7 @@ sub_81B72C8: @ 81B72C8
 	muls r1, r0
 	ldr r0, =gPlayerParty
 	adds r4, r1, r0
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r5, r0, 24
 	cmp r5, 0
@@ -14728,7 +14728,7 @@ sub_81B7FAC: @ 81B7FAC
 	.pool
 _081B7FF8:
 	ldrh r0, [r5]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	beq _081B800C
@@ -14770,7 +14770,7 @@ sub_81B8044: @ 81B8044
 	lsrs r4, r0, 24
 	ldr r5, =gUnknown_0203CEC8
 	ldrh r0, [r5, 0xC]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	beq _081B807C
@@ -15054,7 +15054,7 @@ sub_81B82D4: @ 81B82D4
 	push {r4-r7,lr}
 	lsls r0, 24
 	lsrs r5, r0, 24
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -15093,7 +15093,7 @@ _081B82FA:
 	.pool
 _081B8338:
 	adds r0, r4, 0
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	beq _081B835C

asm/player_pc.s

@@ -733,7 +733,7 @@ sub_816B430: @ 816B430
 	bl sub_816B4C0
 	bl sub_816BC14
 	bl gpu_pal_allocator_reset__manage_upper_four
-	bl sub_8122328
+	bl LoadListMenuArrowsGfx
 	ldr r0, =gUnknown_0203BCC4
 	ldr r0, [r0]
 	movs r1, 0xCD
@@ -1013,7 +1013,7 @@ sub_816B674: @ 816B674
 	cmp r0, 0
 	bne _0816B71E
 	ldrb r0, [r4, 0xA]
-	bl ListMenuHandleInput
+	bl ListMenuHandleInputGetItemId
 	adds r6, r0, 0
 	ldrb r0, [r4, 0xA]
 	ldr r7, =gUnknown_0203BCBA
@@ -1021,7 +1021,7 @@ sub_816B674: @ 816B674
 	mov r8, r1
 	adds r1, r7, 0
 	mov r2, r8
-	bl get_coro_args_x18_x1A
+	bl sub_81AE860
 	movs r0, 0x2
 	negs r0, r0
 	cmp r6, r0
@@ -1263,7 +1263,7 @@ sub_816B8A4: @ 816B8A4
 	adds r0, r1
 	ldr r1, =sub_816B900
 	movs r2, 0x1
-	bl sub_8121478
+	bl ReadMail
 	adds r0, r4, 0
 	bl DestroyTask
 _0816B8E6:
@@ -1378,7 +1378,7 @@ sub_816B9D8: @ 816B9D8
 	push {r4,lr}
 	lsls r0, 24
 	lsrs r4, r0, 24
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r0, 24
 	movs r1, 0x1
@@ -1820,7 +1820,7 @@ _0816BD58:
 	movs r1, 0x2
 	negs r1, r1
 	str r1, [r0]
-	ldr r4, =gUnknown_03006310
+	ldr r4, =gMultiuseListMenuTemplate
 	adds r1, r4, 0
 	ldr r0, =gUnknown_085DFF44
 	ldm r0!, {r2,r3,r6}
@@ -2327,7 +2327,7 @@ _0816C186:
 	bl sub_816C110
 	bl sub_816C140
 	bl sub_816BD04
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	ldr r2, =gUnknown_0203BCB8
 	ldrh r1, [r2, 0x2]
 	ldrh r2, [r2]
@@ -2476,7 +2476,7 @@ sub_816C30C: @ 816C30C
 	ldr r1, =gUnknown_0203BCBA
 	subs r4, r1, 0x2
 	adds r2, r4, 0
-	bl get_coro_args_x18_x1A
+	bl sub_81AE860
 	ldrh r1, [r4, 0x2]
 	ldrh r0, [r4]
 	adds r1, r0
@@ -2492,12 +2492,12 @@ sub_816C30C: @ 816C30C
 	.pool
 _0816C35C:
 	ldrb r0, [r4, 0xA]
-	bl ListMenuHandleInput
+	bl ListMenuHandleInputGetItemId
 	adds r6, r0, 0
 	ldrb r0, [r4, 0xA]
 	ldr r1, =gUnknown_0203BCBA
 	subs r2, r1, 0x2
-	bl get_coro_args_x18_x1A
+	bl sub_81AE860
 	movs r0, 0x2
 	negs r0, r0
 	cmp r6, r0
@@ -2691,18 +2691,18 @@ sub_816C4FC: @ 816C4FC
 	ldrb r0, [r4, 0xA]
 	ldr r1, =gUnknown_0203BCBA
 	subs r2, r1, 0x2
-	bl get_coro_args_x18_x1A
+	bl sub_81AE860
 	b _0816C57E
 	.pool
 _0816C530:
 	ldrb r0, [r4, 0xA]
-	bl ListMenuHandleInput
+	bl ListMenuHandleInputGetItemId
 	adds r6, r0, 0
 	ldrb r0, [r4, 0xA]
 	ldr r1, =gUnknown_0203BCBA
 	subs r4, r1, 0x2
 	adds r2, r4, 0
-	bl get_coro_args_x18_x1A
+	bl sub_81AE860
 	ldr r0, =gUnknown_0203BCC4
 	ldr r0, [r0]
 	movs r1, 0xCD
@@ -2825,7 +2825,7 @@ _0816C622:
 	adds r0, r2
 	movs r1, 0xFF
 	strb r1, [r0]
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	ldr r2, =gUnknown_0203BCB8
 	ldrh r1, [r2, 0x2]
 	ldrh r2, [r2]
@@ -3363,7 +3363,7 @@ sub_816CB04: @ 816CB04
 	bl sub_816C110
 	bl sub_816C140
 	bl sub_816BD04
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	ldrh r1, [r4, 0x2]
 	ldrh r2, [r4]
 	bl ListMenuInit

asm/pokemon_icon.s

@@ -156,7 +156,7 @@ mon_icon_convert_unown_species_id: @ 80D2E08
 	cmp r2, 0xC9
 	bne _080D2E32
 	adds r0, r1, 0
-	bl mon_icon_personality_to_unown_id
+	bl GetUnownLetterByPersonality
 	lsls r0, 16
 	lsrs r0, 16
 	cmp r0, 0
@@ -186,8 +186,8 @@ _080D2E40:
 	bx r1
 	thumb_func_end mon_icon_convert_unown_species_id
 
-	thumb_func_start mon_icon_personality_to_unown_id
+	thumb_func_start GetUnownLetterByPersonality
-mon_icon_personality_to_unown_id: @ 80D2E48
+GetUnownLetterByPersonality: @ 80D2E48
 	push {lr}
 	adds r2, r0, 0
 	cmp r2, 0
@@ -219,7 +219,7 @@ _080D2E7E:
 _080D2E80:
 	pop {r1}
 	bx r1
-	thumb_func_end mon_icon_personality_to_unown_id
+	thumb_func_end GetUnownLetterByPersonality
 
 	thumb_func_start sub_80D2E84
 sub_80D2E84: @ 80D2E84
@@ -229,7 +229,7 @@ sub_80D2E84: @ 80D2E84
 	lsrs r4, r0, 16
 	adds r0, r4, 0
 	mov r1, sp
-	bl sub_80D45E8
+	bl MailSpeciesToSpecies
 	lsls r0, 16
 	lsrs r0, 16
 	cmp r0, 0xC9

asm/pokemon_storage_system.s

@@ -2201,7 +2201,7 @@ _080C83CC:
 	ldr r1, =0x00000ce6
 	adds r0, r1
 	ldrh r0, [r0]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	beq _080C83F4
@@ -2304,7 +2304,7 @@ _080C84C8:
 	ldr r1, =0x00000ce6
 	adds r0, r1
 	ldrh r0, [r0]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	beq _080C84F8
@@ -2874,7 +2874,7 @@ _080C8A0C:
 	ldr r2, =0x00000ce6
 	adds r0, r2
 	ldrh r0, [r0]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	bne _080C8A8C
@@ -2913,7 +2913,7 @@ _080C8A7C:
 	ldr r2, =0x00000ce6
 	adds r0, r1, r2
 	ldrh r0, [r0]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	beq _080C8A98
@@ -3409,7 +3409,7 @@ _080C8F0C:
 	adds r0, 0x1
 	strb r0, [r1]
 _080C8F22:
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -3661,7 +3661,7 @@ _080C914E:
 	ldr r1, =0x00000ce6
 	adds r0, r1
 	ldrh r0, [r0]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	bne _080C9168
@@ -3943,7 +3943,7 @@ _080C93E4:
 	ldr r1, =0x00000ce6
 	adds r0, r1
 	ldrh r0, [r0]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	bne _080C9404
@@ -4133,7 +4133,7 @@ _080C9584:
 	b _080C9664
 	.pool
 _080C95A4:
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -4927,7 +4927,7 @@ _080C9C78:
 	b _080C9CAA
 	.pool
 _080C9C8C:
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -5058,7 +5058,7 @@ _080C9DAC:
 	b _080C9DE0
 	.pool
 _080C9DC0:
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -16168,7 +16168,7 @@ sub_80CFB44: @ 80CFB44
 	.pool
 _080CFB8C:
 	ldrh r0, [r1]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	bne _080CFBA4
@@ -16197,7 +16197,7 @@ _080CFBAC:
 	.pool
 _080CFBCC:
 	ldrh r0, [r1]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1

asm/pokemon_summary_screen.s

@@ -2351,7 +2351,7 @@ _081C51D6:
 	thumb_func_start sub_81C51DC
 sub_81C51DC: @ 81C51DC
 	push {lr}
-	bl sub_8121DA0
+	bl ResetVramOamAndBgCntRegs
 	movs r0, 0
 	bl ResetBgsAndClearDma3BusyFlags
 	ldr r1, =gUnknown_0861F2B4
@@ -2363,7 +2363,7 @@ sub_81C51DC: @ 81C51DC
 	adds r1, 0x4
 	movs r0, 0x2
 	bl SetBgTilemapBuffer
-	bl sub_8121E10
+	bl ResetAllBgsCoordinates
 	movs r0, 0x2
 	bl schedule_bg_copy_tilemap_to_vram
 	movs r1, 0x82
@@ -2460,7 +2460,7 @@ _081C52DC:
 	b _081C5308
 	.pool
 _081C52F0:
-	bl sub_8122328
+	bl LoadListMenuArrowsGfx
 	ldr r0, [r4]
 	ldr r1, =0x00000984
 	adds r0, r1
@@ -2559,7 +2559,7 @@ _081C5382:
 	movs r0, 0x2
 	negs r0, r0
 	str r0, [r1]
-	ldr r2, =gUnknown_03006310
+	ldr r2, =gMultiuseListMenuTemplate
 	adds r1, r2, 0
 	ldr r0, =gUnknown_0861F2C0
 	ldm r0!, {r4,r6,r7}
@@ -2918,7 +2918,7 @@ sub_81C56F8: @ 81C56F8
 	lsls r4, 3
 	ldr r0, =gTasks + 0x8
 	adds r4, r0
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	ldr r2, =gUnknown_0203CF30
 	ldrh r1, [r2, 0x8]
 	ldrh r2, [r2, 0x6]
@@ -3545,7 +3545,7 @@ _081C5C12:
 	adds r1, r4, 0
 	adds r1, 0x8
 	adds r2, r4, 0x6
-	bl get_coro_args_x18_x1A
+	bl sub_81AE860
 	ldrh r1, [r4, 0x8]
 	ldrh r0, [r4, 0x6]
 	adds r1, r0
@@ -3565,14 +3565,14 @@ _081C5C12:
 	.pool
 _081C5C5C:
 	ldrb r0, [r7]
-	bl ListMenuHandleInput
+	bl ListMenuHandleInputGetItemId
 	adds r6, r0, 0
 	ldrb r0, [r7]
 	ldr r1, =gUnknown_0203CF38
 	mov r8, r1
 	mov r2, r8
 	subs r2, 0x2
-	bl get_coro_args_x18_x1A
+	bl sub_81AE860
 	movs r0, 0x2
 	negs r0, r0
 	cmp r6, r0
@@ -4207,7 +4207,7 @@ sub_81C61E0: @ 81C61E0
 	cmp r0, 0x3
 	beq _081C620C
 	ldrh r0, [r4]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -4646,7 +4646,7 @@ sub_81C65CC: @ 81C65CC
 	bl sub_81C5924
 	bl sub_81C59BC
 	bl sub_81C5314
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	ldrh r1, [r6]
 	ldrh r2, [r7]
 	bl ListMenuInit
@@ -4673,7 +4673,7 @@ sub_81C6648: @ 81C6648
 	bl sub_81C61A8
 	ldr r5, =gSpecialVar_ItemId
 	ldrh r0, [r5]
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -4953,18 +4953,18 @@ sub_81C68B0: @ 81C68B0
 	ldrb r0, [r4]
 	ldr r1, =gUnknown_0203CF38
 	subs r2, r1, 0x2
-	bl get_coro_args_x18_x1A
+	bl sub_81AE860
 	b _081C6940
 	.pool
 _081C68F8:
 	ldrb r0, [r4]
-	bl ListMenuHandleInput
+	bl ListMenuHandleInputGetItemId
 	adds r6, r0, 0
 	ldrb r0, [r4]
 	ldr r4, =gUnknown_0203CF38
 	subs r2, r4, 0x2
 	adds r1, r4, 0
-	bl get_coro_args_x18_x1A
+	bl sub_81AE860
 	movs r0, 0
 	bl sub_81C7028
 	subs r4, 0x8
@@ -5066,7 +5066,7 @@ _081C69A8:
 	strh r0, [r1, 0x6]
 _081C69E0:
 	bl sub_81C5314
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	ldrh r1, [r7]
 	mov r3, r8
 	ldrh r2, [r3]
@@ -5124,7 +5124,7 @@ sub_81C6A14: @ 81C6A14
 	strh r0, [r1, 0x6]
 _081C6A5E:
 	bl sub_81C5314
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	ldrh r1, [r5]
 	ldrh r2, [r7]
 	bl ListMenuInit

asm/pokenav.s

@@ -8089,7 +8089,7 @@ _081CB0C0:
 	thumb_func_start sub_81CB0C8
 sub_81CB0C8: @ 81CB0C8
 	push {lr}
-	ldr r1, =gUnknown_085500A4
+	ldr r1, =gRematchTable
 	lsls r0, 4
 	adds r0, r1
 	ldrh r2, [r0, 0xA]
@@ -20738,7 +20738,7 @@ _081D15B6:
 
 	thumb_func_start sub_81D15BC
 sub_81D15BC: @ 81D15BC
-	ldr r1, =gUnknown_085500A4
+	ldr r1, =gRematchTable
 	lsls r0, 4
 	adds r0, r1
 	ldrh r0, [r0]
@@ -20751,7 +20751,7 @@ sub_81D15CC: @ 81D15CC
 	push {lr}
 	adds r3, r0, 0
 	movs r1, 0
-	ldr r2, =gUnknown_085500A4
+	ldr r2, =gRematchTable
 _081D15D4:
 	ldrh r0, [r2]
 	cmp r0, r3
@@ -21440,7 +21440,7 @@ _081D1A24:
 	cmp r0, 0
 	bne _081D1A1C
 	adds r0, r7, 0
-	bl sub_80B2318
+	bl CountBattledRematchTeams
 	lsls r0, 16
 	lsrs r0, 16
 	cmp r0, 0x1
@@ -21921,7 +21921,7 @@ sub_81D1DC0: @ 81D1DC0
 	ldr r7, =gUnknown_0203CF4C
 	ldr r0, =gText_Cancel2
 	mov r12, r0
-	ldr r4, =gUnknown_03006310
+	ldr r4, =gMultiuseListMenuTemplate
 	ldr r1, =gUnknown_0203CF48
 	mov r8, r1
 	ldr r2, =sub_81D1E7C
@@ -23376,7 +23376,7 @@ sub_81D28C8: @ 81D28C8
 	push {r4-r7,lr}
 	lsls r1, 16
 	lsrs r4, r1, 16
-	ldr r3, =gUnknown_03006310
+	ldr r3, =gMultiuseListMenuTemplate
 	adds r2, r3, 0
 	ldr r1, =gUnknown_08625548
 	ldm r1!, {r5-r7}
@@ -30343,8 +30343,8 @@ _081D6176:
 	.pool
 	thumb_func_end sub_81D6134
 
-	thumb_func_start battle_init
+	thumb_func_start sub_81D6180
-battle_init: @ 81D6180
+sub_81D6180: @ 81D6180
 	lsls r0, 24
 	ldr r1, =gSaveBlock2Ptr
 	ldr r1, [r1]
@@ -30355,7 +30355,7 @@ battle_init: @ 81D6180
 	ldrh r0, [r1]
 	bx lr
 	.pool
-	thumb_func_end battle_init
+	thumb_func_end sub_81D6180
 
 	thumb_func_start GetTrainerHillTrainerFlag
 @ u8 GetTrainerHillTrainerFlag(u8 fieldObjectId)

asm/rayquaza_scene.s

@@ -1066,7 +1066,7 @@ sub_81D6FD0: @ 81D6FD0
 	thumb_func_start sub_81D6FE0
 sub_81D6FE0: @ 81D6FE0
 	push {r4,lr}
-	bl sub_8121DA0
+	bl ResetVramOamAndBgCntRegs
 	movs r0, 0
 	bl ResetBgsAndClearDma3BusyFlags
 	ldr r1, =gUnknown_0862A888
@@ -1088,7 +1088,7 @@ sub_81D6FE0: @ 81D6FE0
 	adds r1, r0
 	movs r0, 0x2
 	bl SetBgTilemapBuffer
-	bl sub_8121E10
+	bl ResetAllBgsCoordinates
 	movs r0, 0
 	bl schedule_bg_copy_tilemap_to_vram
 	movs r0, 0x1
@@ -2758,7 +2758,7 @@ _081D7E08:
 	thumb_func_start sub_81D7E10
 sub_81D7E10: @ 81D7E10
 	push {r4,lr}
-	bl sub_8121DA0
+	bl ResetVramOamAndBgCntRegs
 	movs r0, 0
 	bl ResetBgsAndClearDma3BusyFlags
 	ldr r1, =gUnknown_0862AA54
@@ -2780,7 +2780,7 @@ sub_81D7E10: @ 81D7E10
 	adds r1, r0
 	movs r0, 0x2
 	bl SetBgTilemapBuffer
-	bl sub_8121E10
+	bl ResetAllBgsCoordinates
 	movs r0, 0
 	bl schedule_bg_copy_tilemap_to_vram
 	movs r0, 0x1
@@ -3292,7 +3292,7 @@ _081D829A:
 	thumb_func_start sub_81D82B0
 sub_81D82B0: @ 81D82B0
 	push {r4,lr}
-	bl sub_8121DA0
+	bl ResetVramOamAndBgCntRegs
 	movs r0, 0
 	bl ResetBgsAndClearDma3BusyFlags
 	ldr r1, =gUnknown_0862AACC
@@ -3319,7 +3319,7 @@ sub_81D82B0: @ 81D82B0
 	adds r1, r0
 	movs r0, 0x3
 	bl SetBgTilemapBuffer
-	bl sub_8121E10
+	bl ResetAllBgsCoordinates
 	movs r0, 0
 	bl schedule_bg_copy_tilemap_to_vram
 	movs r0, 0x1
@@ -3899,7 +3899,7 @@ _081D8818:
 	thumb_func_start sub_81D8828
 sub_81D8828: @ 81D8828
 	push {r4,lr}
-	bl sub_8121DA0
+	bl ResetVramOamAndBgCntRegs
 	movs r0, 0
 	bl ResetBgsAndClearDma3BusyFlags
 	ldr r1, =gUnknown_0862AB44
@@ -3926,7 +3926,7 @@ sub_81D8828: @ 81D8828
 	adds r1, r0
 	movs r0, 0x3
 	bl SetBgTilemapBuffer
-	bl sub_8121E10
+	bl ResetAllBgsCoordinates
 	movs r0, 0
 	bl schedule_bg_copy_tilemap_to_vram
 	movs r0, 0x1
@@ -4354,7 +4354,7 @@ _081D8C26:
 	thumb_func_start sub_81D8C38
 sub_81D8C38: @ 81D8C38
 	push {r4,lr}
-	bl sub_8121DA0
+	bl ResetVramOamAndBgCntRegs
 	movs r0, 0
 	bl ResetBgsAndClearDma3BusyFlags
 	ldr r1, =gUnknown_0862AD08
@@ -4376,7 +4376,7 @@ sub_81D8C38: @ 81D8C38
 	adds r1, r0
 	movs r0, 0x2
 	bl SetBgTilemapBuffer
-	bl sub_8121E10
+	bl ResetAllBgsCoordinates
 	movs r0, 0
 	bl schedule_bg_copy_tilemap_to_vram
 	movs r0, 0x1

asm/record_mixing.s

@@ -3650,7 +3650,7 @@ _080E8A78:
 	beq _080E8A90
 	mov r0, r8
 	movs r1, 0xFC
-	bl sub_81DB4DC
+	bl PadNameString
 _080E8A90:
 	ldrb r1, [r7]
 	lsrs r1, 4

asm/roulette.s

@@ -425,8 +425,8 @@ _08140618:
 	bl SetVBlankCallback
 	bl remove_some_task
 	bl SetVBlankHBlankCallbacksToNull
-	bl sub_8121DA0
+	bl ResetVramOamAndBgCntRegs
-	bl sub_8121E10
+	bl ResetAllBgsCoordinates
 	b _081407F8
 _08140630:
 	bl sub_8140388
@@ -3258,8 +3258,8 @@ sub_8141E7C: @ 8141E7C
 	ldr r0, =gSpriteCoordOffsetY
 	strh r4, [r0]
 	strh r4, [r1]
-	bl sub_8121DA0
+	bl ResetVramOamAndBgCntRegs
-	bl sub_8121E10
+	bl ResetAllBgsCoordinates
 	movs r0, 0x50
 	movs r1, 0
 	bl SetGpuReg

asm/script_menu.s

@@ -444,7 +444,7 @@ task_yes_no_maybe: @ 80E215C
 	b _080E21C4
 	.pool
 _080E2180:
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	movs r0, 0x1

asm/script_pokemon_util_80F87D8.s

@@ -1174,8 +1174,8 @@ _080F917A:
 	bx r1
 	thumb_func_end sub_80F9160
 
-	thumb_func_start sp000_heal_pokemon
+	thumb_func_start HealPlayerParty
-sp000_heal_pokemon: @ 80F9180
+HealPlayerParty: @ 80F9180
 	push {r4-r7,lr}
 	mov r7, r10
 	mov r6, r9
@@ -1267,7 +1267,7 @@ _080F922C:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sp000_heal_pokemon
+	thumb_func_end HealPlayerParty
 
 	thumb_func_start ScriptGiveMon
 @ void ScriptGiveMon(s16 species_num, u8 level, int held_item)
@@ -1359,8 +1359,8 @@ ScriptGiveEgg: @ 80F92C8
 	bx r1
 	thumb_func_end ScriptGiveEgg
 
-	thumb_func_start sub_80F92F8
+	thumb_func_start HasEnoughMonsForDoubleBattle
-sub_80F92F8: @ 80F92F8
+HasEnoughMonsForDoubleBattle: @ 80F92F8
 	push {lr}
 	bl GetMonsStateToDoubles
 	lsls r0, 24
@@ -1382,7 +1382,7 @@ _080F9318:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_80F92F8
+	thumb_func_end HasEnoughMonsForDoubleBattle
 
 	thumb_func_start sub_80F9320
 sub_80F9320: @ 80F9320

asm/shop.s

@@ -409,7 +409,7 @@ _080DFDAC:
 	adds r4, r0, 0
 	lsls r4, 24
 	lsrs r4, 24
-	ldr r0, =gUnknown_03006310
+	ldr r0, =gMultiuseListMenuTemplate
 	movs r1, 0
 	movs r2, 0
 	bl ListMenuInit
@@ -601,7 +601,7 @@ _080DFF78:
 	movs r0, 0x2
 	negs r0, r0
 	str r0, [r1, 0x4]
-	ldr r3, =gUnknown_03006310
+	ldr r3, =gMultiuseListMenuTemplate
 	adds r1, r3, 0
 	ldr r0, =gUnknown_08589A48
 	ldm r0!, {r4-r6}
@@ -627,7 +627,7 @@ _080DFFDC:
 _080DFFDE:
 	ldr r0, =gUnknown_02039F70
 	ldr r0, [r0]
-	ldr r1, =gUnknown_03006310
+	ldr r1, =gMultiuseListMenuTemplate
 	ldrh r1, [r1, 0xE]
 	ldr r2, =0x00002004
 	adds r0, r2
@@ -1976,7 +1976,7 @@ Task_BuyMenu: @ 80E0AC8
 	b _080E0C8E
 _080E0AEA:
 	ldrb r0, [r4, 0xE]
-	bl ListMenuHandleInput
+	bl ListMenuHandleInputGetItemId
 	adds r5, r0, 0
 	ldrb r0, [r4, 0xE]
 	ldr r7, =gUnknown_02039F70
@@ -1985,7 +1985,7 @@ _080E0AEA:
 	adds r1, r2, r3
 	subs r3, 0x2
 	adds r2, r3
-	bl get_coro_args_x18_x1A
+	bl sub_81AE860
 	movs r0, 0x2
 	negs r0, r0
 	cmp r5, r0

asm/slot_machine.s

@@ -1581,7 +1581,7 @@ sub_812B158: @ 812B158
 	thumb_func_start sub_812B1B0
 sub_812B1B0: @ 812B1B0
 	push {lr}
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0

asm/start_menu.s

@@ -356,7 +356,7 @@ sub_809FA9C: @ 809FA9C
 	bl is_c1_link_related_active
 	cmp r0, 0
 	bne _0809FAB2
-	bl player_bitmagic
+	bl FreezeMapObjects
 	bl sub_808B864
 	bl sub_808BCF4
 _0809FAB2:
@@ -1121,7 +1121,7 @@ sub_80A00EC: @ 80A00EC
 	thumb_func_start sub_80A0108
 sub_80A0108: @ 80A0108
 	push {lr}
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -1226,7 +1226,7 @@ sub_80A01D0: @ 80A01D0
 	thumb_func_start sub_80A01EC
 sub_80A01EC: @ 80A01EC
 	push {lr}
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -1441,7 +1441,7 @@ sub_80A0388: @ 80A0388
 	thumb_func_start sub_80A03A4
 sub_80A03A4: @ 80A03A4
 	push {lr}
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0

asm/trade.s

@@ -3696,7 +3696,7 @@ _0807920E:
 	thumb_func_start sub_8079218
 sub_8079218: @ 8079218
 	push {lr}
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -3798,7 +3798,7 @@ _080792D8:
 	thumb_func_start sub_80792E4
 sub_80792E4: @ 80792E4
 	push {lr}
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	asrs r1, r0, 24
 	cmp r1, 0
@@ -7602,7 +7602,7 @@ sub_807B170: @ 807B170
 	movs r0, 0x3
 	bl SetBgTilemapBuffer
 	bl DeactivateAllTextPrinters
-	ldr r0, =gUnknown_08C00000
+	ldr r0, =gBattleTextboxTiles
 	mov r10, r0
 	movs r0, 0
 	mov r9, r0
@@ -7611,7 +7611,7 @@ sub_807B170: @ 807B170
 	movs r2, 0
 	movs r3, 0
 	bl copy_decompressed_tile_data_to_vram_autofree
-	ldr r0, =gUnknown_08C00524
+	ldr r0, =gBattleTextboxTilemap
 	mov r8, r0
 	ldr r4, =0x0201c000
 	adds r1, r4, 0
@@ -7621,7 +7621,7 @@ sub_807B170: @ 807B170
 	adds r2, r5, 0
 	movs r3, 0
 	bl CopyToBgTilemapBuffer
-	ldr r6, =gUnknown_08C004E0
+	ldr r6, =gBattleTextboxPalette
 	adds r0, r6, 0
 	movs r1, 0
 	movs r2, 0x20
@@ -13369,7 +13369,7 @@ sub_807E7E8: @ 807E7E8
 	ldrh r0, [r5, 0x28]
 	cmp r0, 0
 	beq _0807E960
-	bl itemid_is_mail
+	bl ItemIsMail
 	lsls r0, 24
 	cmp r0, 0
 	beq _0807E954
@@ -13442,7 +13442,7 @@ _0807E98E:
 	bl StringCopy
 	adds r0, r4, 0
 	movs r1, 0
-	bl sub_81DB4DC
+	bl PadNameString
 	ldr r1, [r6, 0x18]
 	lsrs r0, r1, 24
 	strb r0, [r5, 0x1A]

asm/trainer_rematch.s

@@ -178,14 +178,14 @@ sub_81DA6CC: @ 81DA6CC
 	push {r4-r6,lr}
 	adds r5, r0, 0
 	movs r4, 0
-	ldr r6, =gUnknown_085500A4
+	ldr r6, =gRematchTable
 _081DA6D4:
 	lsls r0, r4, 1
 	lsls r1, r5, 4
 	adds r0, r1
 	adds r0, r6
 	ldrh r0, [r0]
-	bl HasTrainerAlreadyBeenFought
+	bl HasTrainerBeenFought
 	lsls r0, 24
 	cmp r0, 0
 	bne _081DA6F0

asm/use_pokeblock.s

@@ -5,350 +5,10 @@
 
 	.text
 
-	thumb_func_start sub_8166204
-sub_8166204: @ 8166204
-	push {r4-r6,lr}
-	adds r5, r0, 0
-	adds r6, r1, 0
-	ldr r4, =gUnknown_0203BCAC
-	ldr r0, =0x0000806c
-	bl AllocZeroed
-	str r0, [r4]
-	ldr r1, =gUnknown_0203BC90
-	ldr r2, =0x00007fd0
-	adds r0, r2
-	str r0, [r1]
-	str r5, [r0, 0x8]
-	str r6, [r0, 0x4]
-	ldr r0, =sub_8166380
-	bl launch_c3_walk_stairs_and_run_once
-	ldr r0, =sub_816631C
-	bl SetMainCallback2
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8166204
 
-	thumb_func_start sub_816624C
-sub_816624C: @ 816624C
-	push {r4,r5,lr}
-	ldr r4, =gUnknown_0203BCAC
-	ldr r0, =0x0000806c
-	bl AllocZeroed
-	str r0, [r4]
-	ldr r5, =gUnknown_0203BC90
-	ldr r1, =0x00007fd0
-	adds r0, r1
-	str r0, [r5]
-	ldr r1, =gUnknown_0203BC98
-	ldr r1, [r1]
-	str r1, [r0, 0x8]
-	ldr r1, =gUnknown_0203BC94
-	ldr r1, [r1]
-	str r1, [r0, 0x4]
-	ldr r4, =gUnknown_0203BC9C
-	ldrb r0, [r4]
-	bl sub_81672E4
-	strb r0, [r4]
-	ldr r5, [r5]
-	movs r1, 0
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x3
-	bls _08166284
-	movs r1, 0x1
-_08166284:
-	adds r0, r5, 0
-	adds r0, 0x56
-	strb r1, [r0]
-	ldr r0, =sub_8166380
-	bl launch_c3_walk_stairs_and_run_once
-	ldr r0, =sub_81662C0
-	bl SetMainCallback2
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_816624C
 
-	thumb_func_start sub_81662C0
+	thumb_func_start sub_8166564
-sub_81662C0: @ 81662C0
+sub_8166564: @ 8166564
-	push {r4,lr}
-	ldr r4, =gUnknown_0203BC90
-	ldr r0, [r4]
-	ldr r0, [r0]
-	bl _call_via_r0
-	bl AnimateSprites
-	bl BuildOamBuffer
-	bl UpdatePaletteFade
-	ldr r4, [r4]
-	ldr r1, [r4]
-	ldr r0, =map_warp_consider_1_to_outside_or_stair_or_dive
-	cmp r1, r0
-	bne _081662F0
-	adds r0, r4, 0
-	adds r0, 0x50
-	movs r1, 0
-	strb r1, [r0]
-	ldr r0, =sub_8166304
-	bl SetMainCallback2
-_081662F0:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_81662C0
-
-	thumb_func_start sub_8166304
-sub_8166304: @ 8166304
-	push {lr}
-	bl sub_81668F8
-	bl AnimateSprites
-	bl BuildOamBuffer
-	bl UpdatePaletteFade
-	pop {r0}
-	bx r0
-	thumb_func_end sub_8166304
-
-	thumb_func_start sub_816631C
-sub_816631C: @ 816631C
-	push {lr}
-	ldr r0, =gUnknown_0203BC90
-	ldr r0, [r0]
-	ldr r0, [r0]
-	bl _call_via_r0
-	bl AnimateSprites
-	bl BuildOamBuffer
-	bl RunTextPrinters
-	bl UpdatePaletteFade
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_816631C
-
-	thumb_func_start sub_8166340
-sub_8166340: @ 8166340
-	push {lr}
-	bl LoadOam
-	bl ProcessSpriteCopyRequests
-	bl TransferPlttBuffer
-	ldr r0, =gUnknown_0203BCAC
-	ldr r0, [r0]
-	ldr r1, =0x00007c58
-	adds r0, r1
-	bl sub_81D2108
-	bl sub_80BA0A8
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8166340
-
-	thumb_func_start launch_c3_walk_stairs_and_run_once
-launch_c3_walk_stairs_and_run_once: @ 816636C
-	ldr r1, =gUnknown_0203BC90
-	ldr r1, [r1]
-	str r0, [r1]
-	adds r1, 0x50
-	movs r0, 0
-	strb r0, [r1]
-	bx lr
-	.pool
-	thumb_func_end launch_c3_walk_stairs_and_run_once
-
-	thumb_func_start sub_8166380
-sub_8166380: @ 8166380
-	push {r4,r5,lr}
-	sub sp, 0x4
-	ldr r1, =gUnknown_0203BC90
-	ldr r0, [r1]
-	adds r0, 0x50
-	ldrb r0, [r0]
-	adds r2, r1, 0
-	cmp r0, 0xF
-	bls _08166394
-	b _08166556
-_08166394:
-	lsls r0, 2
-	ldr r1, =_081663A8
-	adds r0, r1
-	ldr r0, [r0]
-	mov pc, r0
-	.pool
-	.align 2, 0
-_081663A8:
-	.4byte _081663E8
-	.4byte _0816640C
-	.4byte _08166416
-	.4byte _08166434
-	.4byte _08166464
-	.4byte _08166468
-	.4byte _08166474
-	.4byte _08166484
-	.4byte _08166490
-	.4byte _0816649C
-	.4byte _081664B8
-	.4byte _081664BC
-	.4byte _081664E4
-	.4byte _08166510
-	.4byte _08166528
-	.4byte _08166550
-_081663E8:
-	ldr r2, =gUnknown_0203BCAC
-	ldr r0, [r2]
-	ldr r1, =0x00007b10
-	adds r0, r1
-	movs r1, 0xFF
-	strb r1, [r0]
-	ldr r0, [r2]
-	ldr r2, =0x00007c58
-	adds r0, r2
-	bl sub_81D1ED4
-	b _0816653C
-	.pool
-_0816640C:
-	bl ResetSpriteData
-	bl FreeAllSpritePalettes
-	b _0816653C
-_08166416:
-	movs r0, 0
-	bl SetVBlankCallback
-	movs r0, 0
-	str r0, [sp]
-	movs r1, 0xC0
-	lsls r1, 19
-	ldr r2, =0x05006000
-	mov r0, sp
-	bl CpuSet
-	b _0816653C
-	.pool
-_08166434:
-	movs r0, 0
-	bl ResetBgsAndClearDma3BusyFlags
-	ldr r1, =gUnknown_085DFCCC
-	movs r0, 0
-	movs r2, 0x4
-	bl InitBgsFromTemplates
-	ldr r0, =gUnknown_085DFCDC
-	bl InitWindows
-	bl DeactivateAllTextPrinters
-	movs r0, 0
-	movs r1, 0x97
-	movs r2, 0xE0
-	bl sub_809882C
-	b _0816653C
-	.pool
-_08166464:
-	ldr r1, [r2]
-	b _08166540
-_08166468:
-	bl sub_8168328
-	lsls r0, 24
-	cmp r0, 0
-	bne _08166556
-	b _0816653C
-_08166474:
-	ldr r1, =gKeyRepeatStartDelay
-	movs r0, 0x14
-	strh r0, [r1]
-	bl sub_8167420
-	b _0816653C
-	.pool
-_08166484:
-	bl sub_8167930
-	lsls r0, 24
-	cmp r0, 0
-	bne _08166556
-	b _0816653C
-_08166490:
-	movs r0, 0
-	bl sub_8167608
-	bl sub_8167760
-	b _0816653C
-_0816649C:
-	ldr r0, =gUnknown_0203BCAC
-	ldr r0, [r0]
-	ldr r1, =0x00007b0e
-	adds r0, r1
-	bl sub_81D312C
-	lsls r0, 24
-	cmp r0, 0
-	bne _08166556
-	b _0816653C
-	.pool
-_081664B8:
-	ldr r1, [r2]
-	b _08166540
-_081664BC:
-	ldr r5, =gUnknown_0203BCAC
-	ldr r1, [r5]
-	ldr r4, =0x00007c58
-	adds r0, r1, r4
-	ldr r2, =0x00007c6c
-	adds r1, r2
-	bl sub_81D2754
-	ldr r0, [r5]
-	adds r0, r4
-	bl sub_81D20AC
-	b _0816653C
-	.pool
-_081664E4:
-	ldr r4, =gUnknown_0203BCAC
-	ldr r0, [r4]
-	ldr r1, =0x00007c58
-	adds r0, r1
-	bl sub_81D20BC
-	lsls r0, 24
-	cmp r0, 0
-	bne _08166556
-	ldr r2, [r4]
-	ldr r1, =0x00007c58
-	adds r0, r2, r1
-	adds r1, 0x14
-	adds r2, r1
-	adds r1, r2, 0
-	bl sub_81D1F84
-	b _0816653C
-	.pool
-_08166510:
-	ldr r0, =gUnknown_0203BCAC
-	ldr r0, [r0]
-	ldr r2, =0x00007c58
-	adds r0, r2
-	bl sub_81D2230
-	b _0816653C
-	.pool
-_08166528:
-	movs r0, 0
-	bl PutWindowTilemap
-	movs r0, 0x1
-	bl PutWindowTilemap
-	movs r0, 0
-	movs r1, 0x1
-	bl sub_8167BA0
-_0816653C:
-	ldr r0, =gUnknown_0203BC90
-	ldr r1, [r0]
-_08166540:
-	adds r1, 0x50
-	ldrb r0, [r1]
-	adds r0, 0x1
-	strb r0, [r1]
-	b _08166556
-	.pool
-_08166550:
-	ldr r0, =map_warp_consider_1_to_outside_or_stair_or_dive
-	bl launch_c3_walk_stairs_and_run_once
-_08166556:
-	add sp, 0x4
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8166380
-
-	thumb_func_start map_warp_consider_1_to_outside_or_stair_or_dive
-map_warp_consider_1_to_outside_or_stair_or_dive: @ 8166564
 	push {r4,lr}
 	sub sp, 0x4
 	ldr r4, =gUnknown_0203BC90
@@ -424,14 +84,14 @@ _081665C0:
 	bl sub_81D3480
 _0816660A:
 	ldr r0, =sub_8166634
-	bl launch_c3_walk_stairs_and_run_once
+	bl sub_816636C
 _08166610:
 	add sp, 0x4
 	pop {r4}
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end map_warp_consider_1_to_outside_or_stair_or_dive
+	thumb_func_end sub_8166564
 
 	thumb_func_start sub_8166634
 sub_8166634: @ 8166634
@@ -567,7 +227,7 @@ _0816675C:
 	.pool
 _08166788:
 	ldr r0, =sub_8166BEC
-	bl launch_c3_walk_stairs_and_run_once
+	bl sub_816636C
 	b _0816680E
 	.pool
 _08166794:
@@ -611,7 +271,7 @@ _081667CC:
 	.pool
 _081667E8:
 	ldr r0, =sub_816681C
-	bl launch_c3_walk_stairs_and_run_once
+	bl sub_816636C
 	b _0816680E
 	.pool
 _081667F4:
@@ -656,7 +316,7 @@ _08166838:
 	adds r0, r1
 	ldrb r0, [r0]
 	bl sub_81672A4
-	ldr r1, =gUnknown_0203BC9C
+	ldr r1, =gPokeblockMonId
 	strb r0, [r1]
 	ldr r1, =gUnknown_0203BC94
 	ldr r2, [r5]
@@ -708,9 +368,9 @@ _08166888:
 	str r5, [r4]
 	bl FreeAllWindowBuffers
 	ldr r1, =gMain
-	ldr r0, =sub_816624C
+	ldr r0, =CB2_ReturnAndChooseMonToGivePokeblock
 	str r0, [r1, 0x8]
-	bl sub_8179D70
+	bl CB2_PreparePokeblockFeedScene
 _081668D4:
 	add sp, 0x4
 	pop {r4,r5}
@@ -752,7 +412,7 @@ _0816693C:
 	ldr r0, [r0]
 	ldr r1, =0x00008041
 	adds r0, r1
-	ldr r1, =gUnknown_0203BC9C
+	ldr r1, =gPokeblockMonId
 	ldrb r0, [r0]
 	ldrb r1, [r1]
 	cmp r0, r1
@@ -837,7 +497,7 @@ _081669F4:
 	adds r0, r1
 	bl sub_81D3464
 	ldr r0, =sub_8166A34
-	bl launch_c3_walk_stairs_and_run_once
+	bl sub_816636C
 	ldr r0, =sub_816631C
 	bl SetMainCallback2
 _08166A18:
@@ -1018,9 +678,9 @@ _08166BB6:
 	bne _08166BDA
 	ldr r0, =gSpecialVar_ItemId
 	ldrb r0, [r0]
-	bl sub_8136F68
+	bl TryClearPokeblock
 	ldr r0, =sub_8166BEC
-	bl launch_c3_walk_stairs_and_run_once
+	bl sub_816636C
 _08166BDA:
 	pop {r4-r6}
 	pop {r0}
@@ -1225,7 +885,7 @@ sub_8166D44: @ 8166D44
 	movs r0, 0x2
 	movs r1, 0x3
 	bl CopyWindowToVram
-	ldr r0, =gUnknown_085DFCFC
+	ldr r0, =sUsePokeblockYesNoWinTemplate
 	movs r1, 0x97
 	movs r2, 0xE
 	movs r3, 0
@@ -1240,7 +900,7 @@ sub_8166D44: @ 8166D44
 	thumb_func_start sub_8166DE4
 sub_8166DE4: @ 8166DE4
 	push {r4,lr}
-	bl sub_8198C58
+	bl ProcessMenuInputNoWrap_
 	lsls r0, 24
 	lsrs r4, r0, 24
 	asrs r1, r0, 24
@@ -1497,7 +1157,7 @@ sub_8166FD4: @ 8166FD4
 	movs r0, 0
 _08166FEC:
 	lsls r0, 16
-	ldr r1, =gUnknown_085DFD04
+	ldr r1, =sContestStatNames
 	lsls r0, r3, 2
 	adds r0, r1
 	ldr r1, [r0]
@@ -1719,7 +1379,7 @@ sub_8167184: @ 8167184
 	adds r0, r3, 0
 	adds r0, 0x6E
 	strh r1, [r0]
-	ldr r0, =gUnknown_0203BC9E
+	ldr r0, =gPokeblockGain
 	movs r1, 0
 	ldrsh r0, [r0, r1]
 	cmp r0, 0

common_syms/trainer_see.txt

@@ -0,0 +1,5 @@
+gUnknown_03006080
+gUnknown_03006084
+gApproachingTrainers
+gNoOfApproachingTrainers
+gUnknown_030060AC

constants/battle_constants.inc

@@ -19,7 +19,7 @@
     .set BATTLE_TYPE_PALACE,          0x20000
     .set BATTLE_TYPE_ARENA,          0x40000
     .set BATTLE_TYPE_FACTORY,         0x80000
-    .set BATTLE_TYPE_x100000,         0x100000
+    .set BATTLE_TYPE_PIKE,         0x100000
     .set BATTLE_TYPE_PYRAMID,         0x200000
     .set BATTLE_TYPE_INGAME_PARTNER,  0x400000
     .set BATTLE_TYPE_x800000,         0x800000
@@ -28,7 +28,7 @@
     .set BATTLE_TYPE_x4000000,        0x4000000
     .set BATTLE_TYPE_SECRET_BASE,     0x8000000
     .set BATTLE_TYPE_GROUDON,         0x10000000
-    .set BATTLE_TYPE_KYORGE,          0x20000000
+    .set BATTLE_TYPE_KYOGRE,          0x20000000
     .set BATTLE_TYPE_RAYQUAZA,        0x40000000
     .set BATTLE_TYPE_x80000000,       0x80000000
     

data/battle_scripts_1.s

@@ -2870,7 +2870,7 @@ BattleScript_FaintedMonTryChooseAnother::
 	jumpifnotbattletype BATTLE_TYPE_TRAINER, BattleScript_FaintedMonChooseAnother
 	jumpifbattletype BATTLE_TYPE_LINK, BattleScript_FaintedMonChooseAnother
 	jumpifbattletype BATTLE_TYPE_x2000000, BattleScript_FaintedMonChooseAnother
-	jumpifbattletype BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_x100000 | BATTLE_TYPE_PYRAMID, BattleScript_FaintedMonChooseAnother
+	jumpifbattletype BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE | BATTLE_TYPE_PYRAMID, BattleScript_FaintedMonChooseAnother
 	jumpifbattletype BATTLE_TYPE_DOUBLE, BattleScript_FaintedMonChooseAnother
 	jumpifword COMMON_BITS, gHitMarker, HITMARKER_x400000, BattleScript_FaintedMonChooseAnother
 	jumpifbyte EQUAL, sBATTLE_STYLE, 0x1, BattleScript_FaintedMonChooseAnother
@@ -2965,7 +2965,7 @@ BattleScript_PayDayMoneyAndPickUpItems::
 
 BattleScript_LocalBattleLost::
 	jumpifbattletype BATTLE_TYPE_DOME, BattleScript_CheckDomeDrew
-	jumpifbattletype BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_x100000 | BATTLE_TYPE_PYRAMID, BattleScript_LocalBattleLostPrintTrainersWinText
+	jumpifbattletype BATTLE_TYPE_BATTLE_TOWER | BATTLE_TYPE_DOME | BATTLE_TYPE_PALACE | BATTLE_TYPE_ARENA | BATTLE_TYPE_FACTORY | BATTLE_TYPE_PIKE | BATTLE_TYPE_PYRAMID, BattleScript_LocalBattleLostPrintTrainersWinText
 	jumpifbattletype BATTLE_TYPE_x4000000, BattleScript_LocalBattleLostPrintTrainersWinText
 	jumpifbattletype BATTLE_TYPE_EREADER_TRAINER, BattleScript_LocalBattleLostEnd
 	jumpifhalfword EQUAL, gTrainerBattleOpponent_A, 0x400, BattleScript_LocalBattleLostEnd

data/battle_setup.s

@@ -1,190 +0,0 @@
-    .include "asm/macros.inc"
-    .include "constants/constants.inc"
-
-    .section .rodata
-    .align 2, 0
-
-gUnknown_0854FE88:: @ 854FE88
-	.byte 0x08, 0x09, 0x05, 0x0a, 0x00, 0x0a, 0x07, 0x06
-
-gUnknown_0854FE90:: @ 854FE90
-	.byte 0x04, 0x0b, 0x02, 0x03, 0x00, 0x0a, 0x01, 0x06
-
-gUnknown_0854FE98:: @ 854FE98
-	.byte 0x1d, 0x1e, 0x1f, 0x20, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28, 0x29
-
-gUnknown_0854FEA4:: @ 854FEA4
-	.byte 0x1f, 0x20, 0x21
-
-gUnknown_0854FEA7:: @ 854FEA7
-	.byte 0x1d, 0x1f, 0x20, 0x21, 0x00
-
-	.align 2
-gUnknown_0854FEAC:: @ 854FEAC
-	.4byte gUnknown_02038BC8, 0x00000000
-	.4byte gTrainerBattleOpponent_A, 0x00000001
-	.4byte gUnknown_02038BD0, 0x00000001
-	.4byte gUnknown_02038BD4, 0x00000002
-	.4byte gUnknown_02038BDC, 0x00000002
-	.4byte gUnknown_02038BE4, 0x00000005
-	.4byte gUnknown_02038BE8, 0x00000005
-	.4byte gUnknown_02038BF0, 0x00000005
-	.4byte gUnknown_02038BEC, 0x00000006
-
-	.align 2
-gUnknown_0854FEF4:: @ 854FEF4
-	.4byte gUnknown_02038BC8, 0x00000000
-	.4byte gTrainerBattleOpponent_A, 0x00000001
-	.4byte gUnknown_02038BD0, 0x00000001
-	.4byte gUnknown_02038BD4, 0x00000002
-	.4byte gUnknown_02038BDC, 0x00000002
-	.4byte gUnknown_02038BE4, 0x00000005
-	.4byte gUnknown_02038BE8, 0x00000005
-	.4byte gUnknown_02038BF0, 0x00000002
-	.4byte gUnknown_02038BEC, 0x00000006
-
-	.align 2
-gUnknown_0854FF3C:: @ 854FF3C
-	.4byte gUnknown_02038BC8, 0x00000000
-	.4byte gTrainerBattleOpponent_A, 0x00000001
-	.4byte gUnknown_02038BD0, 0x00000001
-	.4byte gUnknown_02038BD4, 0x00000002
-	.4byte gUnknown_02038BDC, 0x00000002
-	.4byte gUnknown_02038BE4, 0x00000005
-	.4byte gUnknown_02038BE8, 0x00000002
-	.4byte gUnknown_02038BF0, 0x00000005
-	.4byte gUnknown_02038BEC, 0x00000006
-
-	.align 2
-gUnknown_0854FF84:: @ 854FF84
-	.4byte gUnknown_02038BC8, 0x00000000
-	.4byte gTrainerBattleOpponent_A, 0x00000001
-	.4byte gUnknown_02038BD0, 0x00000001
-	.4byte gUnknown_02038BD4, 0x00000005
-	.4byte gUnknown_02038BDC, 0x00000002
-	.4byte gUnknown_02038BE4, 0x00000005
-	.4byte gUnknown_02038BE8, 0x00000005
-	.4byte gUnknown_02038BF0, 0x00000005
-	.4byte gUnknown_02038BEC, 0x00000006
-
-	.align 2
-gUnknown_0854FFCC:: @ 854FFCC
-	.4byte gUnknown_02038BC8, 0x00000000
-	.4byte gTrainerBattleOpponent_A, 0x00000001
-	.4byte gUnknown_02038BD0, 0x00000001
-	.4byte gUnknown_02038BD4, 0x00000002
-	.4byte gUnknown_02038BDC, 0x00000002
-	.4byte gUnknown_02038BE4, 0x00000005
-	.4byte gUnknown_02038BE8, 0x00000002
-	.4byte gUnknown_02038BF0, 0x00000002
-	.4byte gUnknown_02038BEC, 0x00000006
-
-	.align 2
-gUnknown_08550014:: @ 8550014
-	.4byte gUnknown_02038BC8, 0x00000000
-	.4byte gTrainerBattleOpponent_B, 0x00000001
-	.4byte gUnknown_02038BD0, 0x00000001
-	.4byte gUnknown_02038BD8, 0x00000002
-	.4byte gUnknown_02038BE0, 0x00000002
-	.4byte gUnknown_02038BE4, 0x00000005
-	.4byte gUnknown_02038BE8, 0x00000005
-	.4byte gUnknown_02038BF4, 0x00000005
-	.4byte gUnknown_02038BEC, 0x00000006
-
-	.align 2
-gUnknown_0855005C:: @ 855005C
-	.4byte gUnknown_02038BC8, 0x00000000
-	.4byte gTrainerBattleOpponent_B, 0x00000001
-	.4byte gUnknown_02038BD0, 0x00000001
-	.4byte gUnknown_02038BD8, 0x00000002
-	.4byte gUnknown_02038BE0, 0x00000002
-	.4byte gUnknown_02038BE4, 0x00000005
-	.4byte gUnknown_02038BE8, 0x00000005
-	.4byte gUnknown_02038BF4, 0x00000002
-	.4byte gUnknown_02038BEC, 0x00000006
-
-	.align 2
-gUnknown_085500A4:: @ 85500A4
-	.2byte 0x0025, 0x0028, 0x0029, 0x002a, 0x002b, 0x0000, 0x0021, 0x0000
-	.2byte 0x02e1, 0x032c, 0x032d, 0x032e, 0x032f, 0x0000, 0x0014, 0x0000
-	.2byte 0x002c, 0x002f, 0x0030, 0x0031, 0x0032, 0x0000, 0x001a, 0x0000
-	.2byte 0x0039, 0x003c, 0x003d, 0x003e, 0x003f, 0x0000, 0x0018, 0x0000
-	.2byte 0x0040, 0x0043, 0x0044, 0x0045, 0x0046, 0x0000, 0x0018, 0x0000
-	.2byte 0x02af, 0x02b0, 0x02b1, 0x02b2, 0x02b3, 0x0000, 0x0027, 0x0000
-	.2byte 0x02ff, 0x033c, 0x033d, 0x033e, 0x033f, 0x0000, 0x0024, 0x0000
-	.2byte 0x005e, 0x0065, 0x0066, 0x0067, 0x0068, 0x0000, 0x001a, 0x0000
-	.2byte 0x004e, 0x0054, 0x0055, 0x0056, 0x0057, 0x0000, 0x001a, 0x0000
-	.2byte 0x006c, 0x006e, 0x006f, 0x0070, 0x0071, 0x0018, 0x0014, 0x0000
-	.2byte 0x0072, 0x0078, 0x0079, 0x007a, 0x007b, 0x0000, 0x0013, 0x0000
-	.2byte 0x0090, 0x034c, 0x034d, 0x034e, 0x034f, 0x0018, 0x0038, 0x0000
-	.2byte 0x007f, 0x0084, 0x0085, 0x0086, 0x0087, 0x0000, 0x0024, 0x0000
-	.2byte 0x0088, 0x008b, 0x008c, 0x008d, 0x008e, 0x0000, 0x0013, 0x0000
-	.2byte 0x008f, 0x0093, 0x0094, 0x0095, 0x0096, 0x0000, 0x001d, 0x0000
-	.2byte 0x009b, 0x00af, 0x00b0, 0x00b1, 0x00b2, 0x0000, 0x0016, 0x0000
-	.2byte 0x00b7, 0x00b8, 0x00b9, 0x00ba, 0x00bb, 0x0000, 0x001e, 0x0000
-	.2byte 0x02a0, 0x0338, 0x0339, 0x033a, 0x033b, 0x0000, 0x002a, 0x0000
-	.2byte 0x00c3, 0x0340, 0x0341, 0x0342, 0x0343, 0x0000, 0x0026, 0x0000
-	.2byte 0x00c4, 0x00c5, 0x00c6, 0x00c7, 0x00c8, 0x0000, 0x0021, 0x0000
-	.2byte 0x00ce, 0x00cf, 0x00d0, 0x00d1, 0x00d2, 0x0000, 0x001d, 0x0000
-	.2byte 0x00d8, 0x00db, 0x00dc, 0x00dd, 0x00de, 0x0018, 0x000d, 0x0000
-	.2byte 0x02a9, 0x02aa, 0x02ab, 0x02ac, 0x02ad, 0x0018, 0x0001, 0x0000
-	.2byte 0x00e2, 0x00e4, 0x00e5, 0x00e6, 0x00e7, 0x0000, 0x0023, 0x0000
-	.2byte 0x00ee, 0x00ef, 0x00f0, 0x00f1, 0x00f2, 0x0000, 0x0026, 0x0000
-	.2byte 0x00f9, 0x00fa, 0x00fb, 0x00fc, 0x00fd, 0x0000, 0x0026, 0x0000
-	.2byte 0x00fe, 0x0101, 0x0102, 0x0103, 0x0104, 0x0000, 0x0024, 0x0000
-	.2byte 0x0118, 0x011a, 0x011b, 0x011c, 0x011d, 0x0000, 0x001f, 0x0000
-	.2byte 0x0111, 0x0114, 0x0115, 0x0116, 0x0117, 0x0000, 0x001f, 0x0000
-	.2byte 0x011f, 0x0120, 0x0121, 0x0122, 0x0123, 0x0000, 0x0020, 0x0000
-	.2byte 0x012e, 0x012f, 0x0130, 0x0131, 0x0132, 0x0000, 0x0019, 0x0000
-	.2byte 0x0125, 0x0127, 0x0128, 0x0129, 0x012a, 0x0000, 0x0012, 0x0000
-	.2byte 0x0133, 0x0134, 0x0135, 0x0136, 0x0137, 0x0000, 0x001e, 0x0000
-	.2byte 0x0139, 0x013a, 0x013b, 0x013c, 0x013d, 0x0018, 0x000c, 0x0000
-	.2byte 0x013e, 0x0148, 0x0149, 0x014a, 0x014b, 0x0000, 0x0011, 0x0000
-	.2byte 0x0153, 0x015a, 0x015b, 0x015c, 0x015d, 0x0000, 0x0015, 0x0000
-	.2byte 0x0178, 0x017b, 0x017c, 0x017d, 0x017e, 0x0000, 0x002b, 0x0000
-	.2byte 0x0171, 0x0172, 0x0173, 0x0174, 0x0175, 0x0000, 0x0020, 0x0000
-	.2byte 0x0166, 0x0168, 0x0169, 0x016a, 0x016b, 0x0000, 0x0019, 0x0000
-	.2byte 0x016c, 0x016d, 0x016e, 0x016f, 0x0170, 0x0000, 0x0020, 0x0000
-	.2byte 0x0182, 0x0184, 0x0185, 0x0186, 0x0187, 0x0000, 0x002b, 0x0000
-	.2byte 0x0161, 0x0162, 0x0163, 0x0164, 0x0165, 0x0000, 0x0019, 0x0000
-	.2byte 0x0179, 0x0334, 0x0335, 0x0336, 0x0337, 0x0000, 0x0029, 0x0000
-	.2byte 0x0188, 0x0189, 0x018a, 0x018b, 0x018c, 0x0018, 0x0001, 0x0000
-	.2byte 0x0196, 0x0199, 0x019a, 0x019b, 0x019c, 0x0000, 0x0023, 0x0000
-	.2byte 0x01a3, 0x01a5, 0x01a6, 0x01a7, 0x01a8, 0x0000, 0x001c, 0x0000
-	.2byte 0x01ab, 0x01ae, 0x01af, 0x01b0, 0x01b1, 0x0000, 0x001e, 0x0000
-	.2byte 0x01b2, 0x01b5, 0x01b6, 0x01b7, 0x01b8, 0x0000, 0x001c, 0x0000
-	.2byte 0x01c1, 0x01d1, 0x01d2, 0x01d3, 0x01d4, 0x0000, 0x0027, 0x0000
-	.2byte 0x01da, 0x01dd, 0x01de, 0x01df, 0x01e0, 0x0018, 0x000d, 0x0000
-	.2byte 0x01e1, 0x01e2, 0x01e7, 0x01e8, 0x01e9, 0x0000, 0x0012, 0x0000
-	.2byte 0x01ec, 0x01f1, 0x01f2, 0x01f3, 0x01f4, 0x0000, 0x0028, 0x0000
-	.2byte 0x02e4, 0x0330, 0x0331, 0x0332, 0x0333, 0x0000, 0x0017, 0x0000
-	.2byte 0x0200, 0x0203, 0x0204, 0x0205, 0x0206, 0x0000, 0x0019, 0x0000
-	.2byte 0x0221, 0x0224, 0x0225, 0x0226, 0x0227, 0x0000, 0x0020, 0x0000
-	.2byte 0x021a, 0x021d, 0x021e, 0x021f, 0x0220, 0x0000, 0x0020, 0x0000
-	.2byte 0x0009, 0x0348, 0x0349, 0x034a, 0x034b, 0x0018, 0x0011, 0x0000
-	.2byte 0x022f, 0x0232, 0x0233, 0x0234, 0x0235, 0x0000, 0x0022, 0x0000
-	.2byte 0x0228, 0x022b, 0x022c, 0x022d, 0x022e, 0x0000, 0x0022, 0x0000
-	.2byte 0x025c, 0x025f, 0x0260, 0x0261, 0x0262, 0x0000, 0x0013, 0x0000
-	.2byte 0x026d, 0x026e, 0x026f, 0x0270, 0x0271, 0x0018, 0x000b, 0x0000
-	.2byte 0x0273, 0x027c, 0x027d, 0x027e, 0x027f, 0x0000, 0x001b, 0x0000
-	.2byte 0x0001, 0x0344, 0x0345, 0x0346, 0x0347, 0x0018, 0x000c, 0x0000
-	.2byte 0x0282, 0x0283, 0x0284, 0x0285, 0x0286, 0x0018, 0x003e, 0x0000
-	.2byte 0x0291, 0x0292, 0x0293, 0x0294, 0x0294, 0x0018, 0x002b, 0x0000
-	.2byte 0x0109, 0x0302, 0x0303, 0x0304, 0x0305, 0x0000, 0x0003, 0x0000
-	.2byte 0x010a, 0x0306, 0x0307, 0x0308, 0x0309, 0x0000, 0x000b, 0x0000
-	.2byte 0x010b, 0x030a, 0x030b, 0x030c, 0x030d, 0x0000, 0x0002, 0x0000
-	.2byte 0x010c, 0x030e, 0x030f, 0x0310, 0x0311, 0x0000, 0x000c, 0x0000
-	.2byte 0x010d, 0x0312, 0x0313, 0x0314, 0x0315, 0x0000, 0x0000, 0x0000
-	.2byte 0x010e, 0x0316, 0x0317, 0x0318, 0x0319, 0x0000, 0x0004, 0x0000
-	.2byte 0x010f, 0x031a, 0x031b, 0x031c, 0x031d, 0x0000, 0x0006, 0x0000
-	.2byte 0x0110, 0x031e, 0x031f, 0x0320, 0x0321, 0x0000, 0x0007, 0x0000
-	.2byte 0x0105, 0x0105, 0x0105, 0x0105, 0x0105, 0x0000, 0x0008, 0x0000
-	.2byte 0x0106, 0x0106, 0x0106, 0x0106, 0x0106, 0x0000, 0x0008, 0x0000
-	.2byte 0x0107, 0x0107, 0x0107, 0x0107, 0x0107, 0x0000, 0x0008, 0x0000
-	.2byte 0x0108, 0x0108, 0x0108, 0x0108, 0x0108, 0x0000, 0x0008, 0x0000
-	.2byte 0x014f, 0x014f, 0x014f, 0x014f, 0x014f, 0x0000, 0x0008, 0x0000
-
-	.align 2
-gUnknown_08550584:: @ 8550584
-	.2byte 0x0867, 0x0868, 0x0869, 0x086a, 0x086b, 0x086c, 0x086d, 0x086e
-

data/contest.s

@@ -5,10 +5,10 @@
     .align 2, 0
 
 gUnknown_08587A6C:: @ 8587A6C
-	.incbin "baserom.gba", 0x587a6c, 0x4
+	.byte 0x24, 0x4c, 0x74, 0x9c
 
 gUnknown_08587A70:: @ 8587A70
-	.incbin "baserom.gba", 0x587a70, 0x4
+	.byte 0x24, 0x4c, 0x74, 0x9c
 
 gUnknown_08587A74:: @ 8587A74
 	.incbin "baserom.gba", 0x587a74, 0x5c
@@ -59,19 +59,132 @@ gUnknown_08587C30:: @ 8587C30
 	.include "data/text/contest_text_pointers.inc"
 
 @ 8587D5C
-	.incbin "baserom.gba", 0x587d5c, 0x34
+	.4byte gText_0827D5C1
+	.4byte gText_0827D5DC
+	.4byte gText_0827D600
+	.4byte gText_0827D612
+	.4byte gText_0827D612
+	.4byte gText_0827D62D
+	.4byte gText_0827D654
+	.4byte gText_0827D67E
+	.4byte gText_0827D69C
+	.4byte gText_0827D6BA
+	.4byte gText_0827D6E5
+	.4byte gText_0827D706
+	.4byte gText_0827D71D
 
 gUnknown_08587D90:: @ 8587D90
-	.incbin "baserom.gba", 0x587d90, 0x80
+	.4byte gText_0827D743
+	.4byte gText_0827D764
+	.4byte gText_0827D785
+	.4byte gText_0827D7A5
+	.4byte gText_0827D7C8
+	.4byte gText_0827D7E8
+	.4byte gText_0827D831
+	.4byte gText_0827D855
+	.4byte gText_0827D830
+	.4byte gText_0827D872
+	.4byte gText_0827D88F
+	.4byte gText_0827D8B5
+	.4byte gText_0827D8E4
+	.4byte gText_0827D8FE
+	.4byte gText_0827D926
+	.4byte gText_0827D947
+	.4byte gText_0827D961
+	.4byte gText_0827D986
+	.4byte gText_0827D9B1
+	.4byte gText_0827D9D9
+	.4byte gText_0827DA03
+	.4byte gText_0827DA31
+	.4byte gText_0827DA5B
+	.4byte gText_0827DA85
+	.4byte gText_0827DAB2
+	.4byte gText_0827DADA
+	.4byte gText_0827DB03
+	.4byte gText_0827D830
+	.4byte gText_0827D830
+	.4byte gText_0827D830
+	.4byte gText_0827DB1F
+	.4byte gText_0827DB4E
 
 gUnknown_08587E10:: @ 8587E10
-	.incbin "baserom.gba", 0x587e10, 0xf8
+	.4byte gText_827DB75
+	.4byte gText_827DBB0
+	.4byte gText_827DBE0
+	.4byte gText_827DC0F
+	.4byte gText_827DC45
+	.4byte gText_827DC7C
+	.4byte gText_827DCB4
+	.4byte gText_827DCE7
+	.4byte gText_827DD12
+	.4byte gText_827DD3D
+	.4byte gText_827DD6F
+	.4byte gText_827DD8E
+	.4byte gText_827DDC7
+	.4byte gText_827DDF2
+	.4byte gText_827DE14
+	.4byte gText_827DE44
+	.4byte gText_827DE73
+	.4byte gText_827DEA5
+	.4byte gText_827DED9
+	.4byte gText_827DF02
+	.4byte gText_827DF3A
+	.4byte gText_827DF63
+	.4byte gText_827DF8C
+	.4byte gText_827DFB8
+	.4byte gText_827DFE2
+	.4byte gText_827E00C
+	.4byte gText_827E02F
+	.4byte gText_827E05F
+	.4byte gText_827E08B
+	.4byte gText_827E0B5
+	.4byte gText_827E0DD
+	.4byte gText_827E107
+	.4byte gText_827E143
+	.4byte gText_827E17F
+	.4byte gText_827E1BB
+	.4byte gText_827E1F3
+	.4byte gText_827E220
+	.4byte gText_827E254
+	.4byte gText_827E289
+	.4byte gText_827E2C5
+	.4byte gText_0827E2FE
+	.4byte gText_0827E32E
+	.4byte gText_0827E35B
+	.4byte gText_0827E38D
+	.4byte gText_0827E3C1
+	.4byte gText_0827E3EB
+	.4byte gText_0827E416
+	.4byte gText_0827E448
+	.4byte gText_0827E473
+	.4byte gText_0827E4A6
+	.4byte gText_0827E4D5
+	.4byte gText_0827E504
+	.4byte gText_0827E531
+	.4byte gText_0827E55A
+	.4byte gText_0827E5B2
+	.4byte gText_0827E5D0
+	.4byte gText_0827E606
+	.4byte gText_0827E638
+	.4byte gText_0827E658
+	.4byte gText_0827E68B
+	.4byte gText_0827E6C4
+	.4byte gText_0827E7BA
 
 gUnknown_08587F08:: @ 8587F08
-	.incbin "baserom.gba", 0x587f08, 0x14
+	.4byte gText_0827E85F
+	.4byte gText_0827E868
+	.4byte gText_0827E86F
+	.4byte gText_0827E878
+	.4byte gText_0827E882
 
 gUnknown_08587F1C:: @ 8587F1C
-	.incbin "baserom.gba", 0x587f1c, 0x18
+	.4byte gText_0827E894
+	.4byte gText_0827E89E
+	.4byte gText_0827E8AA
+	.4byte gText_0827E8B4
+	.4byte gText_0827E8BF
+	.4byte gText_0827E8CA
 
 gUnknown_08587F34:: @ 8587F34
 	.incbin "baserom.gba", 0x587f34, 0x10
@@ -86,7 +199,7 @@ gUnknown_085880A4:: @ 85880A4
 	.incbin "baserom.gba", 0x5880a4, 0x1740
 
 gUnknown_085897E4:: @ 85897E4
-	.incbin "baserom.gba", 0x5897e4, 0xc0
+	.incbin "baserom.gba", 0x005897e4, 0xc0
 
 gUnknown_085898A4:: @ 85898A4
 	.incbin "baserom.gba", 0x5898a4, 0x60
@@ -102,3 +215,4 @@ gUnknown_0858998C:: @ 858998C
 
 gUnknown_085899EC:: @ 85899EC
 	.incbin "baserom.gba", 0x5899ec, 0x1c
+

data/contest_painting.s

@@ -45,8 +45,12 @@ gUnknown_085AFDA4:: @ 85AFDA4
 gUnknown_085B02B0:: @ 85B02B0
 	.incbin "baserom.gba", 0x5b02b0, 0x524
 
-gUnknown_085B07D4:: @ 85B07D4
+gContestRankTextPointers:: @ 85B07D4
-	.incbin "baserom.gba", 0x5b07d4, 0x14
+	.4byte gContestRankNormal
+	.4byte gContestRankSuper
+	.4byte gContestRankHyper
+	.4byte gContestRankMaster
+	.4byte gContestLink
 
 gUnknown_085B07E8:: @ 85B07E8
 	.incbin "baserom.gba", 0x5b07e8, 0x4
@@ -54,11 +58,25 @@ gUnknown_085B07E8:: @ 85B07E8
 gUnknown_085B07EC:: @ 85B07EC
 	.incbin "baserom.gba", 0x5b07ec, 0x8
 
-gUnknown_085B07F4:: @ 85B07F4
+gContestPaintingDescriptionPointers:: @ 85B07F4
-	.incbin "baserom.gba", 0x5b07f4, 0x3c
+	.4byte gContestPaintingCool1
+	.4byte gContestPaintingCool2
+	.4byte gContestPaintingCool3
+	.4byte gContestPaintingBeauty1
+	.4byte gContestPaintingBeauty2
+	.4byte gContestPaintingBeauty3
+	.4byte gContestPaintingCute1
+	.4byte gContestPaintingCute2
+	.4byte gContestPaintingCute3
+	.4byte gContestPaintingSmart1
+	.4byte gContestPaintingSmart2
+	.4byte gContestPaintingSmart3
+	.4byte gContestPaintingTough1
+	.4byte gContestPaintingTough2
+	.4byte gContestPaintingTough3
 
 gUnknown_085B0830:: @ 85B0830
-	.incbin "baserom.gba", 0x5b0830, 0x8
+	.4byte 0xc0003000, 0x00000000
 
 gUnknown_085B0838:: @ 85B0838
 	.incbin "baserom.gba", 0x5b0838, 0x4

data/cute_sketch.s

@@ -5,4 +5,304 @@
 	.align 2, 0
 
 gUnknown_085A1F94:: @ 85A1F94
-	.incbin "baserom.gba", 0x5a1f94, 0x2580
+	.byte 0x00, 0x1d, 0x1c, 0x0e, 0x1e, 0x1b, 0x00, 0x01, 0x32, 0x2e, 0x1e, 0x37, 0x0a, 0x22, 0x1f, 0x05, 0x26, 0x2e, 0x12, 0x17, 0x1e, 0x1a, 0x03, 0x11, 0x05, 0x11, 0x18, 0x05, 0x27, 0x2f, 0x1a, 0x3f
+	.byte 0x12, 0x22, 0x3f, 0x16, 0x2b, 0x2f, 0x2e, 0x11, 0x02, 0x2d, 0x23, 0x0d, 0x28, 0x17, 0x0c, 0x19, 0x2f, 0x0e, 0x13, 0x30, 0x18, 0x20, 0x2d, 0x28, 0x22, 0x01, 0x03, 0x19, 0x0e, 0x2a, 0x2b, 0x22
+	.byte 0x15, 0x25, 0x22, 0x0a, 0x26, 0x39, 0x06, 0x23, 0x16, 0x07, 0x2f, 0x22, 0x3a, 0x1b, 0x3b, 0x36, 0x35, 0x0a, 0x2b, 0x24, 0x36, 0x09, 0x12, 0x1c, 0x2f, 0x23, 0x2e, 0x38, 0x2c, 0x05, 0x2a, 0x20
+	.byte 0x07, 0x14, 0x32, 0x31, 0x08, 0x17, 0x1a, 0x24, 0x2d, 0x22, 0x0a, 0x16, 0x1b, 0x26, 0x2b, 0x29, 0x16, 0x11, 0x35, 0x08, 0x14, 0x1e, 0x08, 0x14, 0x05, 0x31, 0x14, 0x38, 0x31, 0x17, 0x34, 0x33
+	.byte 0x12, 0x11, 0x09, 0x1f, 0x28, 0x3d, 0x32, 0x35, 0x03, 0x1e, 0x3c, 0x2b, 0x2e, 0x10, 0x01, 0x17, 0x03, 0x3e, 0x22, 0x17, 0x18, 0x34, 0x08, 0x29, 0x19, 0x03, 0x24, 0x28, 0x3d, 0x33, 0x2f, 0x31
+	.byte 0x24, 0x19, 0x1b, 0x18, 0x26, 0x07, 0x0d, 0x25, 0x2d, 0x3f, 0x12, 0x2f, 0x15, 0x25, 0x29, 0x0f, 0x12, 0x07, 0x2c, 0x12, 0x2c, 0x0b, 0x26, 0x12, 0x1a, 0x16, 0x00, 0x0b, 0x2f, 0x16, 0x35, 0x24
+	.byte 0x1f, 0x1c, 0x22, 0x29, 0x33, 0x27, 0x3b, 0x30, 0x17, 0x11, 0x06, 0x35, 0x3e, 0x31, 0x2f, 0x11, 0x3a, 0x25, 0x2a, 0x02, 0x19, 0x33, 0x18, 0x35, 0x2a, 0x20, 0x21, 0x2e, 0x32, 0x1b, 0x3b, 0x1f
+	.byte 0x23, 0x39, 0x29, 0x2a, 0x2e, 0x31, 0x29, 0x2a, 0x0e, 0x2d, 0x2d, 0x00, 0x1f, 0x38, 0x28, 0x1b, 0x14, 0x3b, 0x2b, 0x2e, 0x04, 0x26, 0x36, 0x30, 0x11, 0x3b, 0x21, 0x2d, 0x2b, 0x3f, 0x1b, 0x20
+	.byte 0x13, 0x31, 0x33, 0x0c, 0x30, 0x22, 0x2b, 0x2b, 0x16, 0x02, 0x1e, 0x1c, 0x12, 0x1c, 0x0f, 0x3c, 0x36, 0x38, 0x10, 0x2d, 0x18, 0x2f, 0x2d, 0x35, 0x3b, 0x11, 0x37, 0x31, 0x13, 0x13, 0x3d, 0x2f
+	.byte 0x1e, 0x2c, 0x33, 0x2e, 0x37, 0x12, 0x3c, 0x1f, 0x33, 0x32, 0x2a, 0x27, 0x0d, 0x3b, 0x1c, 0x35, 0x2a, 0x27, 0x09, 0x3d, 0x27, 0x12, 0x0b, 0x18, 0x0c, 0x15, 0x1d, 0x20, 0x01, 0x1c, 0x08, 0x3b
+	.byte 0x1c, 0x12, 0x37, 0x33, 0x15, 0x03, 0x2c, 0x2a, 0x3b, 0x31, 0x0f, 0x04, 0x35, 0x08, 0x17, 0x33, 0x38, 0x3d, 0x2a, 0x2f, 0x35, 0x16, 0x10, 0x35, 0x16, 0x23, 0x13, 0x2c, 0x2f, 0x06, 0x20, 0x27
+	.byte 0x3a, 0x24, 0x00, 0x1c, 0x2a, 0x03, 0x39, 0x1d, 0x28, 0x07, 0x1a, 0x20, 0x0a, 0x37, 0x07, 0x35, 0x2d, 0x15, 0x2f, 0x2c, 0x10, 0x2c, 0x23, 0x3f, 0x29, 0x14, 0x2a, 0x21, 0x36, 0x34, 0x1a, 0x2c
+	.byte 0x1c, 0x3d, 0x33, 0x38, 0x2b, 0x22, 0x35, 0x28, 0x1f, 0x3d, 0x0f, 0x1c, 0x1e, 0x3e, 0x1b, 0x0c, 0x3e, 0x1f, 0x2b, 0x31, 0x2c, 0x32, 0x39, 0x11, 0x05, 0x09, 0x11, 0x04, 0x38, 0x2a, 0x32, 0x00
+	.byte 0x16, 0x13, 0x0b, 0x31, 0x34, 0x2a, 0x13, 0x2c, 0x22, 0x21, 0x39, 0x2f, 0x15, 0x37, 0x28, 0x1e, 0x07, 0x3b, 0x2d, 0x11, 0x03, 0x28, 0x2d, 0x30, 0x1e, 0x31, 0x11, 0x11, 0x23, 0x01, 0x1e, 0x3d
+	.byte 0x31, 0x34, 0x1c, 0x02, 0x34, 0x21, 0x0e, 0x25, 0x3d, 0x07, 0x17, 0x33, 0x15, 0x10, 0x29, 0x32, 0x32, 0x18, 0x1f, 0x30, 0x2d, 0x3b, 0x30, 0x27, 0x3e, 0x16, 0x31, 0x15, 0x12, 0x30, 0x25, 0x17
+	.byte 0x33, 0x06, 0x34, 0x00, 0x29, 0x18, 0x3c, 0x03, 0x12, 0x2c, 0x0c, 0x11, 0x09, 0x30, 0x30, 0x10, 0x0e, 0x11, 0x27, 0x16, 0x1b, 0x0c, 0x3b, 0x2e, 0x2b, 0x33, 0x1e, 0x13, 0x2d, 0x2d, 0x11, 0x24
+	.byte 0x29, 0x34, 0x3e, 0x2b, 0x24, 0x1e, 0x21, 0x27, 0x1a, 0x2d, 0x04, 0x39, 0x16, 0x3e, 0x33, 0x26, 0x1b, 0x2e, 0x25, 0x0c, 0x06, 0x19, 0x25, 0x19, 0x18, 0x1d, 0x33, 0x33, 0x1d, 0x28, 0x2d, 0x1c
+	.byte 0x10, 0x2a, 0x1f, 0x35, 0x1e, 0x34, 0x02, 0x10, 0x2b, 0x3a, 0x14, 0x0d, 0x0b, 0x15, 0x0c, 0x2c, 0x10, 0x37, 0x3a, 0x19, 0x06, 0x13, 0x17, 0x24, 0x10, 0x25, 0x24, 0x04, 0x1e, 0x00, 0x35, 0x34
+	.byte 0x3a, 0x00, 0x37, 0x3c, 0x07, 0x1a, 0x2b, 0x28, 0x36, 0x34, 0x39, 0x2f, 0x28, 0x09, 0x1f, 0x38, 0x31, 0x30, 0x16, 0x25, 0x31, 0x18, 0x28, 0x31, 0x18, 0x0c, 0x22, 0x06, 0x39, 0x2d, 0x3d, 0x20
+	.byte 0x24, 0x2e, 0x27, 0x21, 0x3e, 0x18, 0x18, 0x15, 0x3c, 0x24, 0x06, 0x1b, 0x26, 0x15, 0x0e, 0x22, 0x0a, 0x0d, 0x1f, 0x18, 0x16, 0x34, 0x10, 0x28, 0x21, 0x20, 0x11, 0x11, 0x36, 0x32, 0x15, 0x3b
+	.byte 0x2e, 0x24, 0x1f, 0x2d, 0x12, 0x36, 0x2e, 0x20, 0x0b, 0x17, 0x33, 0x26, 0x03, 0x1f, 0x08, 0x19, 0x31, 0x2a, 0x18, 0x25, 0x35, 0x2d, 0x2d, 0x30, 0x38, 0x18, 0x1c, 0x25, 0x14, 0x1c, 0x22, 0x28
+	.byte 0x08, 0x23, 0x21, 0x26, 0x1e, 0x30, 0x19, 0x0f, 0x15, 0x10, 0x2f, 0x22, 0x12, 0x02, 0x25, 0x3c, 0x01, 0x1d, 0x0e, 0x14, 0x18, 0x0d, 0x18, 0x17, 0x22, 0x0b, 0x31, 0x13, 0x34, 0x21, 0x0f, 0x2d
+	.byte 0x36, 0x39, 0x1f, 0x25, 0x18, 0x10, 0x1f, 0x2d, 0x20, 0x20, 0x19, 0x0b, 0x31, 0x33, 0x13, 0x14, 0x2e, 0x11, 0x21, 0x2d, 0x0a, 0x37, 0x07, 0x15, 0x1b, 0x32, 0x04, 0x32, 0x06, 0x18, 0x1b, 0x13
+	.byte 0x24, 0x12, 0x36, 0x22, 0x16, 0x1d, 0x29, 0x1c, 0x35, 0x17, 0x21, 0x36, 0x17, 0x2b, 0x35, 0x32, 0x19, 0x2a, 0x0f, 0x2e, 0x10, 0x00, 0x34, 0x02, 0x0e, 0x28, 0x31, 0x32, 0x32, 0x3b, 0x05, 0x20
+	.byte 0x36, 0x26, 0x12, 0x34, 0x06, 0x34, 0x1e, 0x31, 0x32, 0x35, 0x05, 0x34, 0x1e, 0x13, 0x15, 0x15, 0x14, 0x2c, 0x29, 0x1c, 0x18, 0x24, 0x24, 0x12, 0x22, 0x29, 0x18, 0x34, 0x36, 0x30, 0x1e, 0x01
+	.byte 0x23, 0x0c, 0x3c, 0x24, 0x0a, 0x3d, 0x16, 0x27, 0x1e, 0x23, 0x15, 0x02, 0x12, 0x11, 0x19, 0x2a, 0x1d, 0x31, 0x15, 0x03, 0x3b, 0x2a, 0x21, 0x19, 0x2c, 0x0a, 0x23, 0x11, 0x25, 0x11, 0x1a, 0x1a
+	.byte 0x0a, 0x34, 0x3b, 0x0b, 0x33, 0x21, 0x0b, 0x37, 0x01, 0x31, 0x28, 0x35, 0x1d, 0x27, 0x2c, 0x30, 0x31, 0x2e, 0x39, 0x2d, 0x30, 0x05, 0x2c, 0x12, 0x2a, 0x2b, 0x39, 0x22, 0x20, 0x15, 0x34, 0x1c
+	.byte 0x1c, 0x01, 0x15, 0x20, 0x16, 0x22, 0x13, 0x04, 0x18, 0x1e, 0x13, 0x10, 0x25, 0x33, 0x15, 0x39, 0x03, 0x31, 0x3f, 0x36, 0x18, 0x14, 0x23, 0x10, 0x2f, 0x1e, 0x1f, 0x1f, 0x17, 0x2c, 0x02, 0x16
+	.byte 0x31, 0x20, 0x18, 0x30, 0x2e, 0x18, 0x37, 0x3b, 0x0e, 0x30, 0x10, 0x39, 0x24, 0x26, 0x39, 0x1e, 0x30, 0x26, 0x2e, 0x12, 0x01, 0x14, 0x37, 0x2a, 0x2e, 0x21, 0x06, 0x1d, 0x2a, 0x16, 0x32, 0x09
+	.byte 0x38, 0x1c, 0x07, 0x22, 0x17, 0x3b, 0x2d, 0x15, 0x07, 0x1e, 0x2e, 0x1b, 0x2e, 0x1d, 0x04, 0x09, 0x30, 0x30, 0x2d, 0x37, 0x2d, 0x34, 0x24, 0x18, 0x24, 0x25, 0x0e, 0x2d, 0x26, 0x23, 0x0a, 0x16
+	.byte 0x12, 0x2d, 0x11, 0x21, 0x28, 0x2e, 0x0f, 0x01, 0x21, 0x01, 0x31, 0x12, 0x3f, 0x1b, 0x1e, 0x21, 0x25, 0x2b, 0x26, 0x18, 0x13, 0x15, 0x2d, 0x34, 0x23, 0x21, 0x36, 0x0e, 0x2e, 0x1c, 0x14, 0x22
+	.byte 0x1c, 0x2c, 0x0b, 0x28, 0x1a, 0x18, 0x21, 0x21, 0x07, 0x1a, 0x24, 0x26, 0x29, 0x2b, 0x0a, 0x34, 0x3e, 0x27, 0x33, 0x12, 0x34, 0x1b, 0x1f, 0x01, 0x2a, 0x2e, 0x06, 0x23, 0x2f, 0x1f, 0x14, 0x18
+	.byte 0x06, 0x26, 0x31, 0x1f, 0x2b, 0x22, 0x26, 0x2e, 0x1e, 0x15, 0x16, 0x20, 0x22, 0x28, 0x15, 0x37, 0x12, 0x25, 0x04, 0x2c, 0x1f, 0x04, 0x2e, 0x0c, 0x13, 0x18, 0x07, 0x0b, 0x36, 0x1d, 0x1c, 0x2a
+	.byte 0x30, 0x22, 0x1c, 0x2e, 0x12, 0x2f, 0x2b, 0x21, 0x1e, 0x16, 0x38, 0x30, 0x04, 0x02, 0x16, 0x05, 0x14, 0x20, 0x38, 0x3c, 0x33, 0x21, 0x1b, 0x2f, 0x14, 0x2a, 0x27, 0x38, 0x14, 0x1b, 0x2b, 0x1f
+	.byte 0x2b, 0x29, 0x2b, 0x25, 0x27, 0x36, 0x21, 0x11, 0x22, 0x1b, 0x29, 0x03, 0x1b, 0x18, 0x24, 0x28, 0x21, 0x2d, 0x36, 0x3c, 0x2c, 0x24, 0x33, 0x17, 0x1f, 0x2a, 0x3a, 0x21, 0x0a, 0x23, 0x37, 0x00
+	.byte 0x0b, 0x21, 0x11, 0x38, 0x19, 0x0f, 0x0e, 0x1c, 0x1f, 0x0f, 0x37, 0x3c, 0x10, 0x37, 0x38, 0x31, 0x35, 0x07, 0x15, 0x28, 0x1e, 0x2e, 0x19, 0x26, 0x10, 0x33, 0x3d, 0x35, 0x2f, 0x3a, 0x04, 0x34
+	.byte 0x0d, 0x18, 0x1a, 0x01, 0x2d, 0x15, 0x3d, 0x1a, 0x17, 0x17, 0x3f, 0x32, 0x0b, 0x21, 0x11, 0x1e, 0x26, 0x2b, 0x0d, 0x19, 0x24, 0x2e, 0x04, 0x1b, 0x1b, 0x33, 0x20, 0x15, 0x21, 0x1d, 0x1f, 0x04
+	.byte 0x21, 0x0f, 0x12, 0x1f, 0x2d, 0x2a, 0x32, 0x03, 0x37, 0x1f, 0x35, 0x07, 0x27, 0x24, 0x1f, 0x31, 0x2f, 0x30, 0x15, 0x06, 0x00, 0x24, 0x0b, 0x22, 0x1a, 0x0c, 0x3b, 0x29, 0x14, 0x1a, 0x17, 0x37
+	.byte 0x20, 0x25, 0x3f, 0x26, 0x37, 0x3a, 0x3e, 0x10, 0x22, 0x04, 0x11, 0x28, 0x12, 0x1c, 0x03, 0x2e, 0x2e, 0x0e, 0x38, 0x28, 0x01, 0x29, 0x22, 0x1e, 0x33, 0x19, 0x06, 0x21, 0x27, 0x33, 0x19, 0x1a
+	.byte 0x02, 0x05, 0x17, 0x11, 0x11, 0x2c, 0x1f, 0x26, 0x1e, 0x39, 0x1f, 0x28, 0x2e, 0x2f, 0x12, 0x22, 0x34, 0x13, 0x3b, 0x26, 0x2f, 0x34, 0x00, 0x14, 0x10, 0x31, 0x11, 0x1d, 0x2d, 0x2a, 0x08, 0x08
+	.byte 0x37, 0x15, 0x18, 0x34, 0x04, 0x2b, 0x24, 0x2f, 0x1e, 0x27, 0x22, 0x2a, 0x24, 0x07, 0x14, 0x25, 0x01, 0x27, 0x19, 0x29, 0x0a, 0x29, 0x3d, 0x1c, 0x2f, 0x0d, 0x1f, 0x1c, 0x24, 0x3d, 0x32, 0x36
+	.byte 0x1d, 0x24, 0x14, 0x21, 0x16, 0x1a, 0x0d, 0x29, 0x3f, 0x2b, 0x2a, 0x1a, 0x3e, 0x35, 0x11, 0x28, 0x18, 0x32, 0x05, 0x15, 0x21, 0x2e, 0x34, 0x2d, 0x14, 0x2a, 0x3c, 0x08, 0x37, 0x3f, 0x34, 0x1e
+	.byte 0x27, 0x24, 0x1c, 0x16, 0x16, 0x33, 0x29, 0x3b, 0x19, 0x36, 0x2f, 0x1c, 0x03, 0x25, 0x2c, 0x0b, 0x16, 0x36, 0x1c, 0x1d, 0x1b, 0x2c, 0x27, 0x1b, 0x0b, 0x1f, 0x2b, 0x08, 0x10, 0x27, 0x3f, 0x25
+	.byte 0x2f, 0x33, 0x13, 0x1f, 0x04, 0x31, 0x37, 0x0e, 0x2f, 0x12, 0x08, 0x23, 0x20, 0x3a, 0x1a, 0x1e, 0x2f, 0x0b, 0x1f, 0x1e, 0x20, 0x19, 0x23, 0x3b, 0x14, 0x25, 0x00, 0x27, 0x14, 0x04, 0x25, 0x36
+	.byte 0x1a, 0x2b, 0x27, 0x21, 0x15, 0x28, 0x13, 0x2c, 0x0e, 0x3c, 0x35, 0x0c, 0x2d, 0x2b, 0x37, 0x16, 0x15, 0x29, 0x15, 0x1d, 0x17, 0x34, 0x36, 0x09, 0x0a, 0x31, 0x37, 0x22, 0x28, 0x17, 0x2b, 0x35
+	.byte 0x14, 0x2b, 0x12, 0x08, 0x13, 0x1f, 0x31, 0x13, 0x28, 0x06, 0x07, 0x35, 0x23, 0x3a, 0x29, 0x0f, 0x24, 0x2e, 0x07, 0x35, 0x26, 0x0e, 0x12, 0x15, 0x23, 0x33, 0x2c, 0x0e, 0x21, 0x26, 0x1c, 0x12
+	.byte 0x25, 0x23, 0x1d, 0x2f, 0x04, 0x35, 0x33, 0x16, 0x01, 0x24, 0x3d, 0x2c, 0x2e, 0x35, 0x0a, 0x25, 0x11, 0x13, 0x25, 0x1b, 0x1b, 0x15, 0x15, 0x39, 0x10, 0x0b, 0x35, 0x24, 0x3a, 0x27, 0x30, 0x2e
+	.byte 0x2f, 0x15, 0x10, 0x1f, 0x35, 0x1b, 0x28, 0x35, 0x26, 0x30, 0x37, 0x34, 0x37, 0x2b, 0x0f, 0x30, 0x29, 0x2e, 0x3f, 0x2b, 0x38, 0x34, 0x2b, 0x2b, 0x2f, 0x25, 0x0d, 0x28, 0x2a, 0x33, 0x18, 0x10
+	.byte 0x21, 0x12, 0x11, 0x1f, 0x22, 0x34, 0x11, 0x25, 0x23, 0x21, 0x3f, 0x11, 0x26, 0x27, 0x25, 0x28, 0x36, 0x12, 0x15, 0x26, 0x32, 0x11, 0x18, 0x24, 0x32, 0x25, 0x37, 0x27, 0x3a, 0x33, 0x35, 0x07
+	.byte 0x1c, 0x1a, 0x0e, 0x2a, 0x1e, 0x2f, 0x1f, 0x00, 0x2e, 0x21, 0x1b, 0x3c, 0x14, 0x2f, 0x3a, 0x2f, 0x3e, 0x38, 0x15, 0x1a, 0x13, 0x2f, 0x29, 0x0d, 0x2f, 0x37, 0x17, 0x18, 0x30, 0x1c, 0x35, 0x15
+	.byte 0x34, 0x14, 0x28, 0x11, 0x2c, 0x2c, 0x25, 0x2a, 0x20, 0x3f, 0x28, 0x0c, 0x34, 0x1b, 0x30, 0x2e, 0x25, 0x37, 0x1c, 0x24, 0x1f, 0x25, 0x26, 0x0c, 0x19, 0x34, 0x18, 0x10, 0x35, 0x0a, 0x13, 0x11
+	.byte 0x25, 0x13, 0x20, 0x13, 0x19, 0x11, 0x20, 0x28, 0x1d, 0x3e, 0x30, 0x1b, 0x23, 0x24, 0x21, 0x0d, 0x23, 0x23, 0x1d, 0x28, 0x2e, 0x2d, 0x12, 0x1f, 0x0e, 0x2e, 0x2b, 0x0b, 0x31, 0x32, 0x24, 0x3c
+	.byte 0x2c, 0x13, 0x3c, 0x12, 0x28, 0x16, 0x2a, 0x05, 0x0c, 0x32, 0x39, 0x0b, 0x32, 0x21, 0x04, 0x14, 0x10, 0x31, 0x32, 0x12, 0x1f, 0x23, 0x39, 0x2e, 0x2e, 0x22, 0x3d, 0x27, 0x0c, 0x1e, 0x18, 0x25
+	.byte 0x00, 0x17, 0x06, 0x31, 0x14, 0x13, 0x21, 0x1a, 0x14, 0x20, 0x35, 0x0a, 0x3b, 0x25, 0x33, 0x08, 0x28, 0x3d, 0x02, 0x33, 0x23, 0x00, 0x13, 0x22, 0x21, 0x28, 0x30, 0x14, 0x2e, 0x14, 0x32, 0x36
+	.byte 0x39, 0x23, 0x1e, 0x1c, 0x11, 0x30, 0x37, 0x16, 0x30, 0x15, 0x31, 0x1f, 0x34, 0x28, 0x2c, 0x35, 0x05, 0x29, 0x37, 0x33, 0x2a, 0x1c, 0x17, 0x2e, 0x10, 0x06, 0x16, 0x32, 0x1f, 0x2f, 0x00, 0x29
+	.byte 0x1e, 0x04, 0x01, 0x16, 0x3b, 0x23, 0x1e, 0x1b, 0x34, 0x2a, 0x30, 0x11, 0x2b, 0x03, 0x00, 0x1f, 0x1d, 0x37, 0x1a, 0x3a, 0x18, 0x25, 0x1c, 0x16, 0x2c, 0x04, 0x3f, 0x33, 0x26, 0x23, 0x2d, 0x15
+	.byte 0x2c, 0x27, 0x02, 0x35, 0x27, 0x07, 0x35, 0x33, 0x1a, 0x0c, 0x10, 0x28, 0x26, 0x2c, 0x2f, 0x36, 0x16, 0x37, 0x0b, 0x27, 0x1b, 0x3d, 0x18, 0x27, 0x1f, 0x20, 0x2b, 0x2a, 0x33, 0x0b, 0x0f, 0x20
+	.byte 0x35, 0x3c, 0x2f, 0x33, 0x21, 0x15, 0x2d, 0x26, 0x34, 0x1f, 0x1a, 0x21, 0x2f, 0x2c, 0x2a, 0x1a, 0x32, 0x1a, 0x3b, 0x3f, 0x21, 0x13, 0x3f, 0x13, 0x0f, 0x24, 0x22, 0x14, 0x1b, 0x10, 0x21, 0x06
+	.byte 0x28, 0x25, 0x34, 0x10, 0x2e, 0x0e, 0x14, 0x3c, 0x3e, 0x25, 0x16, 0x06, 0x30, 0x0b, 0x04, 0x1f, 0x3e, 0x02, 0x24, 0x0c, 0x17, 0x25, 0x2b, 0x3c, 0x2d, 0x15, 0x36, 0x33, 0x18, 0x23, 0x2a, 0x1d
+	.byte 0x10, 0x2a, 0x35, 0x17, 0x28, 0x00, 0x37, 0x24, 0x0a, 0x3b, 0x15, 0x1d, 0x0b, 0x1f, 0x3c, 0x31, 0x25, 0x1d, 0x0f, 0x1d, 0x20, 0x13, 0x34, 0x11, 0x2b, 0x2e, 0x23, 0x0c, 0x2e, 0x24, 0x02, 0x14
+	.byte 0x31, 0x16, 0x19, 0x0e, 0x23, 0x35, 0x1a, 0x10, 0x16, 0x14, 0x04, 0x19, 0x2d, 0x27, 0x37, 0x33, 0x02, 0x31, 0x02, 0x04, 0x16, 0x0d, 0x22, 0x25, 0x25, 0x00, 0x16, 0x2a, 0x3f, 0x26, 0x20, 0x0c
+	.byte 0x12, 0x2f, 0x2e, 0x35, 0x1b, 0x0d, 0x22, 0x1e, 0x01, 0x34, 0x05, 0x22, 0x21, 0x34, 0x2a, 0x32, 0x0b, 0x09, 0x1d, 0x3f, 0x32, 0x2f, 0x3d, 0x18, 0x2d, 0x0b, 0x38, 0x36, 0x39, 0x17, 0x28, 0x34
+	.byte 0x04, 0x24, 0x36, 0x0e, 0x2a, 0x38, 0x01, 0x14, 0x3c, 0x24, 0x22, 0x21, 0x03, 0x18, 0x32, 0x2f, 0x12, 0x29, 0x24, 0x31, 0x0a, 0x3b, 0x12, 0x1a, 0x1c, 0x20, 0x30, 0x31, 0x1b, 0x1a, 0x21, 0x10
+	.byte 0x05, 0x29, 0x10, 0x26, 0x2d, 0x13, 0x16, 0x0c, 0x1d, 0x2b, 0x06, 0x1b, 0x06, 0x12, 0x14, 0x38, 0x0f, 0x35, 0x23, 0x3a, 0x2c, 0x00, 0x19, 0x33, 0x29, 0x14, 0x2d, 0x2a, 0x21, 0x29, 0x14, 0x31
+	.byte 0x14, 0x1a, 0x06, 0x1e, 0x18, 0x1b, 0x28, 0x3b, 0x16, 0x29, 0x15, 0x1e, 0x12, 0x34, 0x0a, 0x14, 0x1b, 0x05, 0x27, 0x0b, 0x01, 0x26, 0x2a, 0x22, 0x35, 0x21, 0x20, 0x18, 0x20, 0x37, 0x17, 0x14
+	.byte 0x1f, 0x11, 0x1d, 0x11, 0x25, 0x24, 0x2b, 0x2f, 0x07, 0x3f, 0x1f, 0x2c, 0x25, 0x25, 0x2a, 0x29, 0x18, 0x11, 0x24, 0x28, 0x31, 0x2c, 0x2a, 0x39, 0x0b, 0x26, 0x28, 0x10, 0x26, 0x22, 0x06, 0x16
+	.byte 0x09, 0x2c, 0x13, 0x34, 0x19, 0x15, 0x3a, 0x12, 0x21, 0x1d, 0x38, 0x23, 0x12, 0x25, 0x24, 0x21, 0x30, 0x12, 0x37, 0x1a, 0x12, 0x24, 0x3b, 0x25, 0x32, 0x15, 0x23, 0x0d, 0x1a, 0x10, 0x16, 0x2e
+	.byte 0x26, 0x1d, 0x14, 0x16, 0x3e, 0x2e, 0x1f, 0x0a, 0x16, 0x10, 0x1d, 0x30, 0x2b, 0x04, 0x3a, 0x19, 0x08, 0x2d, 0x2e, 0x28, 0x1e, 0x33, 0x0a, 0x12, 0x2e, 0x0d, 0x03, 0x2f, 0x26, 0x3a, 0x1e, 0x35
+	.byte 0x3b, 0x2a, 0x03, 0x1a, 0x18, 0x3f, 0x0b, 0x27, 0x04, 0x05, 0x34, 0x36, 0x0b, 0x27, 0x3b, 0x17, 0x11, 0x0d, 0x27, 0x26, 0x2c, 0x1f, 0x20, 0x26, 0x10, 0x20, 0x25, 0x23, 0x2d, 0x37, 0x09, 0x13
+	.byte 0x14, 0x17, 0x2d, 0x2e, 0x3d, 0x23, 0x1d, 0x1a, 0x1f, 0x21, 0x33, 0x2e, 0x28, 0x17, 0x13, 0x26, 0x3c, 0x36, 0x14, 0x1a, 0x33, 0x32, 0x20, 0x2b, 0x19, 0x3e, 0x20, 0x0c, 0x02, 0x2d, 0x3c, 0x3c
+	.byte 0x2a, 0x30, 0x30, 0x28, 0x25, 0x3f, 0x1e, 0x03, 0x17, 0x1e, 0x35, 0x11, 0x1c, 0x1b, 0x14, 0x2a, 0x28, 0x3a, 0x23, 0x0e, 0x1f, 0x12, 0x36, 0x21, 0x20, 0x07, 0x3b, 0x10, 0x23, 0x19, 0x34, 0x0d
+	.byte 0x2e, 0x18, 0x3f, 0x20, 0x25, 0x3e, 0x3b, 0x15, 0x0b, 0x2e, 0x12, 0x37, 0x0b, 0x23, 0x3d, 0x32, 0x1f, 0x16, 0x03, 0x27, 0x14, 0x0c, 0x21, 0x18, 0x03, 0x30, 0x3e, 0x21, 0x13, 0x0f, 0x00, 0x32
+	.byte 0x3f, 0x23, 0x16, 0x0e, 0x31, 0x1d, 0x18, 0x1c, 0x1d, 0x30, 0x0e, 0x1e, 0x21, 0x20, 0x23, 0x3f, 0x0c, 0x1e, 0x14, 0x33, 0x22, 0x22, 0x21, 0x15, 0x36, 0x05, 0x1e, 0x1d, 0x31, 0x14, 0x20, 0x11
+	.byte 0x37, 0x0d, 0x33, 0x19, 0x25, 0x05, 0x36, 0x1e, 0x31, 0x20, 0x35, 0x3a, 0x2f, 0x32, 0x2f, 0x30, 0x14, 0x23, 0x2d, 0x35, 0x1e, 0x29, 0x05, 0x05, 0x1b, 0x09, 0x1f, 0x26, 0x2f, 0x0b, 0x15, 0x15
+	.byte 0x11, 0x13, 0x29, 0x1b, 0x18, 0x1c, 0x13, 0x35, 0x34, 0x31, 0x23, 0x27, 0x3f, 0x2f, 0x09, 0x30, 0x19, 0x23, 0x12, 0x34, 0x02, 0x2a, 0x21, 0x09, 0x3c, 0x1d, 0x0c, 0x02, 0x10, 0x22, 0x05, 0x17
+	.byte 0x22, 0x08, 0x1b, 0x0a, 0x0f, 0x15, 0x02, 0x11, 0x13, 0x01, 0x21, 0x22, 0x16, 0x39, 0x33, 0x24, 0x38, 0x34, 0x0f, 0x1e, 0x2b, 0x2b, 0x15, 0x15, 0x20, 0x22, 0x2e, 0x3a, 0x3f, 0x31, 0x1a, 0x27
+	.byte 0x2b, 0x29, 0x34, 0x14, 0x16, 0x39, 0x2f, 0x13, 0x3e, 0x16, 0x36, 0x21, 0x30, 0x00, 0x24, 0x2b, 0x24, 0x21, 0x30, 0x15, 0x31, 0x13, 0x10, 0x37, 0x24, 0x08, 0x07, 0x23, 0x21, 0x09, 0x25, 0x05
+	.byte 0x3c, 0x32, 0x19, 0x03, 0x25, 0x0f, 0x29, 0x2b, 0x16, 0x07, 0x13, 0x3e, 0x3d, 0x25, 0x36, 0x0b, 0x28, 0x2e, 0x2b, 0x16, 0x0c, 0x31, 0x11, 0x30, 0x13, 0x2d, 0x26, 0x3e, 0x37, 0x29, 0x2f, 0x2e
+	.byte 0x15, 0x3d, 0x17, 0x1c, 0x2e, 0x21, 0x33, 0x2f, 0x10, 0x0d, 0x05, 0x1d, 0x1c, 0x1a, 0x12, 0x0e, 0x18, 0x37, 0x1b, 0x11, 0x14, 0x06, 0x14, 0x21, 0x31, 0x0e, 0x27, 0x1a, 0x03, 0x10, 0x00, 0x34
+	.byte 0x31, 0x3f, 0x0b, 0x1d, 0x0f, 0x12, 0x1f, 0x1a, 0x15, 0x10, 0x0f, 0x00, 0x24, 0x3e, 0x0a, 0x2a, 0x30, 0x2b, 0x24, 0x26, 0x31, 0x10, 0x2d, 0x2f, 0x2f, 0x3f, 0x0c, 0x13, 0x12, 0x0b, 0x16, 0x15
+	.byte 0x07, 0x1f, 0x28, 0x10, 0x32, 0x0f, 0x17, 0x15, 0x0b, 0x27, 0x33, 0x34, 0x1d, 0x10, 0x1c, 0x3a, 0x12, 0x2c, 0x27, 0x37, 0x0a, 0x1a, 0x32, 0x05, 0x1f, 0x21, 0x24, 0x0d, 0x1f, 0x1c, 0x17, 0x24
+	.byte 0x2f, 0x3b, 0x32, 0x3b, 0x25, 0x10, 0x03, 0x2f, 0x21, 0x0c, 0x10, 0x23, 0x0e, 0x3a, 0x2c, 0x33, 0x03, 0x2c, 0x12, 0x06, 0x1c, 0x2a, 0x37, 0x30, 0x3f, 0x01, 0x1e, 0x35, 0x16, 0x37, 0x2c, 0x32
+	.byte 0x35, 0x05, 0x11, 0x22, 0x29, 0x09, 0x20, 0x2b, 0x0d, 0x1f, 0x18, 0x0d, 0x20, 0x23, 0x39, 0x16, 0x0f, 0x3a, 0x18, 0x21, 0x35, 0x2b, 0x36, 0x26, 0x2b, 0x23, 0x05, 0x2f, 0x1b, 0x08, 0x17, 0x3e
+	.byte 0x09, 0x16, 0x2d, 0x3a, 0x37, 0x15, 0x35, 0x35, 0x29, 0x0a, 0x12, 0x02, 0x39, 0x1f, 0x14, 0x34, 0x33, 0x17, 0x1d, 0x18, 0x16, 0x1d, 0x1a, 0x01, 0x39, 0x22, 0x1e, 0x27, 0x36, 0x32, 0x14, 0x26
+	.byte 0x0a, 0x39, 0x36, 0x1f, 0x0d, 0x1e, 0x0b, 0x0a, 0x19, 0x35, 0x1d, 0x34, 0x03, 0x12, 0x16, 0x0c, 0x13, 0x2e, 0x0c, 0x34, 0x1e, 0x10, 0x14, 0x1e, 0x23, 0x32, 0x27, 0x02, 0x10, 0x29, 0x35, 0x18
+	.byte 0x33, 0x33, 0x1d, 0x1a, 0x3c, 0x15, 0x23, 0x3e, 0x3f, 0x22, 0x2a, 0x02, 0x2c, 0x28, 0x0a, 0x2f, 0x1a, 0x06, 0x35, 0x3c, 0x17, 0x2b, 0x03, 0x12, 0x17, 0x2f, 0x0a, 0x26, 0x12, 0x38, 0x11, 0x36
+	.byte 0x1b, 0x23, 0x01, 0x39, 0x35, 0x19, 0x19, 0x17, 0x09, 0x28, 0x22, 0x1e, 0x27, 0x2c, 0x35, 0x33, 0x2c, 0x27, 0x25, 0x31, 0x06, 0x31, 0x2d, 0x1a, 0x39, 0x28, 0x2d, 0x04, 0x1e, 0x24, 0x3e, 0x1c
+	.byte 0x3c, 0x30, 0x1b, 0x3f, 0x3e, 0x37, 0x22, 0x36, 0x11, 0x00, 0x01, 0x1c, 0x12, 0x1a, 0x10, 0x12, 0x1e, 0x2c, 0x1f, 0x12, 0x2a, 0x2f, 0x06, 0x19, 0x35, 0x1a, 0x18, 0x3b, 0x09, 0x36, 0x34, 0x1d
+	.byte 0x13, 0x02, 0x07, 0x10, 0x20, 0x2f, 0x1d, 0x0b, 0x03, 0x33, 0x1c, 0x16, 0x31, 0x05, 0x13, 0x1b, 0x29, 0x06, 0x13, 0x30, 0x2d, 0x36, 0x2a, 0x2d, 0x2c, 0x19, 0x34, 0x1c, 0x0f, 0x15, 0x12, 0x36
+	.byte 0x15, 0x2c, 0x3a, 0x06, 0x1c, 0x12, 0x1d, 0x26, 0x03, 0x38, 0x1d, 0x01, 0x01, 0x2d, 0x17, 0x2e, 0x10, 0x14, 0x17, 0x1c, 0x34, 0x0f, 0x28, 0x09, 0x37, 0x1b, 0x28, 0x1d, 0x26, 0x29, 0x2d, 0x36
+	.byte 0x1e, 0x17, 0x28, 0x15, 0x0f, 0x1c, 0x20, 0x2d, 0x10, 0x27, 0x16, 0x2e, 0x14, 0x09, 0x12, 0x3b, 0x3d, 0x21, 0x25, 0x1a, 0x2c, 0x00, 0x22, 0x36, 0x0d, 0x30, 0x10, 0x17, 0x19, 0x1b, 0x00, 0x3b
+	.byte 0x21, 0x2a, 0x28, 0x34, 0x2d, 0x0f, 0x16, 0x0a, 0x30, 0x28, 0x06, 0x00, 0x25, 0x31, 0x2e, 0x2a, 0x14, 0x33, 0x28, 0x36, 0x10, 0x2e, 0x05, 0x2e, 0x19, 0x19, 0x1a, 0x15, 0x2c, 0x14, 0x17, 0x37
+	.byte 0x0f, 0x13, 0x32, 0x17, 0x1b, 0x39, 0x18, 0x32, 0x2e, 0x32, 0x1e, 0x24, 0x1d, 0x31, 0x12, 0x1d, 0x2b, 0x14, 0x0c, 0x27, 0x36, 0x2e, 0x32, 0x06, 0x0a, 0x1a, 0x28, 0x28, 0x20, 0x3a, 0x3a, 0x17
+	.byte 0x08, 0x27, 0x36, 0x18, 0x1a, 0x10, 0x1e, 0x26, 0x1b, 0x1f, 0x33, 0x1f, 0x21, 0x17, 0x2f, 0x01, 0x08, 0x20, 0x35, 0x03, 0x19, 0x3b, 0x02, 0x20, 0x02, 0x2d, 0x23, 0x0e, 0x17, 0x32, 0x31, 0x29
+	.byte 0x11, 0x22, 0x17, 0x22, 0x3a, 0x2c, 0x23, 0x34, 0x20, 0x18, 0x00, 0x3a, 0x22, 0x25, 0x33, 0x21, 0x33, 0x04, 0x27, 0x04, 0x18, 0x32, 0x2c, 0x0c, 0x2f, 0x28, 0x14, 0x2c, 0x3f, 0x30, 0x2b, 0x30
+	.byte 0x21, 0x1d, 0x01, 0x25, 0x32, 0x05, 0x23, 0x34, 0x24, 0x10, 0x30, 0x3d, 0x14, 0x1b, 0x3f, 0x38, 0x2f, 0x22, 0x1b, 0x32, 0x25, 0x07, 0x37, 0x0a, 0x0c, 0x1d, 0x03, 0x1e, 0x1a, 0x0f, 0x3c, 0x12
+	.byte 0x11, 0x18, 0x1d, 0x00, 0x35, 0x2f, 0x32, 0x18, 0x14, 0x23, 0x30, 0x1b, 0x11, 0x3d, 0x12, 0x1a, 0x16, 0x35, 0x28, 0x05, 0x24, 0x17, 0x3d, 0x37, 0x2e, 0x09, 0x2e, 0x18, 0x1d, 0x17, 0x20, 0x1f
+	.byte 0x18, 0x23, 0x2c, 0x2f, 0x20, 0x3f, 0x16, 0x3f, 0x29, 0x2e, 0x23, 0x3b, 0x29, 0x18, 0x39, 0x13, 0x1e, 0x32, 0x35, 0x14, 0x1d, 0x2a, 0x35, 0x01, 0x1d, 0x3e, 0x3b, 0x1e, 0x22, 0x1e, 0x16, 0x18
+	.byte 0x22, 0x12, 0x3e, 0x29, 0x33, 0x2f, 0x14, 0x19, 0x3b, 0x07, 0x15, 0x06, 0x3d, 0x29, 0x35, 0x37, 0x23, 0x34, 0x1d, 0x2d, 0x18, 0x12, 0x1b, 0x0b, 0x13, 0x24, 0x13, 0x38, 0x1c, 0x1f, 0x0b, 0x1b
+	.byte 0x13, 0x21, 0x1c, 0x06, 0x39, 0x32, 0x37, 0x3d, 0x26, 0x29, 0x26, 0x15, 0x3c, 0x33, 0x27, 0x00, 0x01, 0x2e, 0x15, 0x18, 0x31, 0x0d, 0x2c, 0x13, 0x27, 0x3b, 0x20, 0x2d, 0x01, 0x26, 0x23, 0x15
+	.byte 0x30, 0x24, 0x00, 0x17, 0x37, 0x3f, 0x33, 0x25, 0x24, 0x31, 0x06, 0x3b, 0x37, 0x03, 0x18, 0x1a, 0x2c, 0x34, 0x14, 0x1d, 0x36, 0x18, 0x3a, 0x04, 0x23, 0x12, 0x26, 0x15, 0x2b, 0x19, 0x1a, 0x29
+	.byte 0x2c, 0x36, 0x01, 0x19, 0x1d, 0x2f, 0x06, 0x2b, 0x0c, 0x12, 0x26, 0x36, 0x32, 0x1d, 0x0d, 0x12, 0x28, 0x03, 0x28, 0x13, 0x29, 0x06, 0x17, 0x03, 0x38, 0x21, 0x30, 0x2c, 0x10, 0x22, 0x00, 0x28
+	.byte 0x24, 0x3b, 0x1c, 0x20, 0x3e, 0x13, 0x02, 0x0c, 0x19, 0x29, 0x2c, 0x1a, 0x39, 0x30, 0x22, 0x2a, 0x1f, 0x22, 0x14, 0x34, 0x2c, 0x14, 0x25, 0x1b, 0x06, 0x3b, 0x15, 0x06, 0x1c, 0x13, 0x15, 0x03
+	.byte 0x18, 0x1e, 0x2a, 0x1b, 0x17, 0x25, 0x2f, 0x1c, 0x29, 0x2e, 0x02, 0x32, 0x1e, 0x1d, 0x28, 0x35, 0x36, 0x03, 0x34, 0x16, 0x3d, 0x2a, 0x12, 0x0d, 0x13, 0x1d, 0x2d, 0x21, 0x32, 0x17, 0x2e, 0x1a
+	.byte 0x15, 0x26, 0x22, 0x2f, 0x15, 0x3c, 0x0e, 0x20, 0x2f, 0x27, 0x13, 0x04, 0x09, 0x32, 0x1e, 0x01, 0x34, 0x06, 0x16, 0x1e, 0x2e, 0x1b, 0x1c, 0x28, 0x13, 0x2a, 0x30, 0x34, 0x12, 0x12, 0x32, 0x18
+	.byte 0x1d, 0x1d, 0x35, 0x07, 0x1c, 0x16, 0x2d, 0x3d, 0x35, 0x1c, 0x1b, 0x24, 0x21, 0x2d, 0x1e, 0x10, 0x09, 0x14, 0x3d, 0x11, 0x12, 0x25, 0x02, 0x26, 0x23, 0x02, 0x19, 0x19, 0x05, 0x14, 0x0b, 0x21
+	.byte 0x1a, 0x09, 0x02, 0x2c, 0x18, 0x28, 0x2d, 0x1e, 0x10, 0x12, 0x2e, 0x18, 0x2e, 0x1f, 0x02, 0x2c, 0x14, 0x17, 0x24, 0x39, 0x08, 0x32, 0x16, 0x14, 0x22, 0x16, 0x28, 0x21, 0x11, 0x10, 0x2c, 0x23
+	.byte 0x36, 0x2b, 0x39, 0x21, 0x26, 0x0e, 0x06, 0x2d, 0x3c, 0x3e, 0x26, 0x2a, 0x1b, 0x1f, 0x00, 0x3c, 0x33, 0x35, 0x3f, 0x14, 0x00, 0x0b, 0x10, 0x34, 0x3c, 0x17, 0x2d, 0x07, 0x1f, 0x24, 0x39, 0x27
+	.byte 0x16, 0x00, 0x1d, 0x33, 0x2b, 0x1e, 0x0f, 0x08, 0x31, 0x3a, 0x09, 0x13, 0x0c, 0x21, 0x1c, 0x2a, 0x17, 0x34, 0x29, 0x27, 0x10, 0x37, 0x1b, 0x18, 0x15, 0x08, 0x2f, 0x1f, 0x16, 0x12, 0x1f, 0x28
+	.byte 0x34, 0x1c, 0x20, 0x22, 0x12, 0x01, 0x12, 0x21, 0x31, 0x10, 0x22, 0x26, 0x1e, 0x01, 0x3d, 0x11, 0x1e, 0x27, 0x25, 0x3d, 0x30, 0x24, 0x1d, 0x11, 0x22, 0x36, 0x30, 0x16, 0x1f, 0x3e, 0x2a, 0x3c
+	.byte 0x27, 0x1b, 0x1f, 0x29, 0x10, 0x1e, 0x05, 0x2a, 0x0a, 0x10, 0x14, 0x1f, 0x00, 0x2e, 0x0b, 0x3b, 0x18, 0x0a, 0x39, 0x30, 0x37, 0x0b, 0x1f, 0x1d, 0x0a, 0x29, 0x3e, 0x1c, 0x33, 0x13, 0x2e, 0x28
+	.byte 0x27, 0x1b, 0x1e, 0x1d, 0x02, 0x1c, 0x01, 0x25, 0x14, 0x3a, 0x10, 0x1c, 0x12, 0x05, 0x2a, 0x30, 0x20, 0x26, 0x2f, 0x2e, 0x2e, 0x03, 0x07, 0x24, 0x36, 0x04, 0x2b, 0x11, 0x25, 0x2d, 0x28, 0x0e
+	.byte 0x2e, 0x0f, 0x1d, 0x15, 0x1c, 0x28, 0x30, 0x1f, 0x23, 0x26, 0x36, 0x12, 0x37, 0x3a, 0x31, 0x10, 0x2c, 0x2c, 0x2f, 0x1a, 0x0d, 0x15, 0x3f, 0x3c, 0x32, 0x35, 0x1c, 0x16, 0x33, 0x16, 0x28, 0x1d
+	.byte 0x3f, 0x21, 0x2c, 0x3e, 0x2b, 0x24, 0x23, 0x2f, 0x32, 0x15, 0x2a, 0x1b, 0x10, 0x35, 0x18, 0x37, 0x10, 0x3b, 0x1e, 0x11, 0x2b, 0x16, 0x24, 0x1d, 0x16, 0x26, 0x3c, 0x2d, 0x11, 0x15, 0x28, 0x28
+	.byte 0x27, 0x27, 0x27, 0x3b, 0x3a, 0x16, 0x1a, 0x0c, 0x1a, 0x15, 0x08, 0x25, 0x0b, 0x10, 0x22, 0x1a, 0x3e, 0x17, 0x28, 0x1f, 0x1e, 0x01, 0x1e, 0x1e, 0x1c, 0x2f, 0x10, 0x25, 0x0b, 0x34, 0x3e, 0x0c
+	.byte 0x1a, 0x1b, 0x10, 0x2a, 0x0f, 0x14, 0x17, 0x0f, 0x3f, 0x17, 0x03, 0x15, 0x1f, 0x02, 0x36, 0x17, 0x15, 0x1d, 0x18, 0x08, 0x36, 0x10, 0x14, 0x0d, 0x2b, 0x0a, 0x05, 0x1d, 0x26, 0x12, 0x1e, 0x3e
+	.byte 0x18, 0x19, 0x36, 0x18, 0x37, 0x17, 0x39, 0x2e, 0x0d, 0x04, 0x19, 0x16, 0x22, 0x15, 0x3e, 0x26, 0x1f, 0x00, 0x06, 0x17, 0x33, 0x22, 0x1d, 0x2b, 0x39, 0x2b, 0x3e, 0x31, 0x1c, 0x22, 0x3f, 0x13
+	.byte 0x30, 0x1c, 0x31, 0x07, 0x2b, 0x14, 0x32, 0x35, 0x1e, 0x02, 0x07, 0x20, 0x0f, 0x3b, 0x11, 0x20, 0x07, 0x12, 0x2a, 0x30, 0x1d, 0x28, 0x38, 0x36, 0x20, 0x01, 0x17, 0x15, 0x20, 0x21, 0x3a, 0x1b
+	.byte 0x1e, 0x38, 0x12, 0x24, 0x03, 0x3e, 0x1f, 0x29, 0x1d, 0x13, 0x20, 0x27, 0x19, 0x12, 0x25, 0x20, 0x32, 0x33, 0x2b, 0x3f, 0x05, 0x31, 0x35, 0x3c, 0x2d, 0x2d, 0x02, 0x2e, 0x10, 0x2a, 0x16, 0x17
+	.byte 0x08, 0x31, 0x17, 0x2e, 0x2b, 0x30, 0x1e, 0x15, 0x31, 0x15, 0x26, 0x08, 0x10, 0x33, 0x15, 0x01, 0x27, 0x12, 0x07, 0x2f, 0x29, 0x27, 0x34, 0x3f, 0x08, 0x31, 0x1c, 0x20, 0x1a, 0x33, 0x0c, 0x13
+	.byte 0x18, 0x31, 0x24, 0x37, 0x2d, 0x2e, 0x21, 0x18, 0x24, 0x3a, 0x27, 0x31, 0x35, 0x3e, 0x30, 0x3a, 0x14, 0x33, 0x0f, 0x1a, 0x2d, 0x30, 0x2e, 0x11, 0x1a, 0x31, 0x1d, 0x17, 0x3c, 0x18, 0x33, 0x31
+	.byte 0x23, 0x1d, 0x39, 0x2d, 0x10, 0x1d, 0x2f, 0x24, 0x15, 0x1c, 0x25, 0x01, 0x2b, 0x22, 0x16, 0x2e, 0x1b, 0x25, 0x35, 0x37, 0x10, 0x26, 0x39, 0x01, 0x36, 0x17, 0x2b, 0x14, 0x09, 0x16, 0x17, 0x20
+	.byte 0x28, 0x23, 0x26, 0x3a, 0x26, 0x27, 0x2a, 0x24, 0x36, 0x02, 0x2c, 0x29, 0x30, 0x35, 0x36, 0x01, 0x1f, 0x28, 0x3b, 0x1d, 0x23, 0x1e, 0x2d, 0x11, 0x1e, 0x2c, 0x2f, 0x32, 0x19, 0x3f, 0x26, 0x31
+	.byte 0x38, 0x1e, 0x17, 0x05, 0x18, 0x2e, 0x00, 0x2e, 0x12, 0x34, 0x3f, 0x34, 0x16, 0x10, 0x29, 0x20, 0x3d, 0x36, 0x2f, 0x16, 0x25, 0x12, 0x17, 0x10, 0x21, 0x37, 0x35, 0x25, 0x37, 0x2d, 0x01, 0x08
+	.byte 0x27, 0x03, 0x1f, 0x29, 0x0d, 0x2a, 0x16, 0x3a, 0x3f, 0x33, 0x2b, 0x19, 0x1d, 0x2a, 0x1f, 0x29, 0x28, 0x2c, 0x10, 0x28, 0x30, 0x10, 0x39, 0x14, 0x1b, 0x00, 0x18, 0x21, 0x28, 0x0c, 0x37, 0x11
+	.byte 0x10, 0x11, 0x3c, 0x33, 0x32, 0x33, 0x36, 0x1a, 0x36, 0x00, 0x1c, 0x31, 0x1b, 0x1d, 0x38, 0x1d, 0x10, 0x3c, 0x39, 0x27, 0x3a, 0x3f, 0x14, 0x19, 0x12, 0x14, 0x0d, 0x1f, 0x18, 0x00, 0x25, 0x18
+	.byte 0x28, 0x1c, 0x32, 0x27, 0x03, 0x1a, 0x26, 0x2d, 0x2a, 0x29, 0x28, 0x27, 0x0a, 0x2a, 0x18, 0x0a, 0x1a, 0x30, 0x20, 0x1a, 0x2e, 0x06, 0x0b, 0x1d, 0x0f, 0x0c, 0x1c, 0x35, 0x28, 0x1c, 0x3d, 0x16
+	.byte 0x23, 0x21, 0x1c, 0x31, 0x14, 0x1c, 0x2e, 0x22, 0x32, 0x35, 0x09, 0x29, 0x30, 0x20, 0x1a, 0x10, 0x31, 0x3f, 0x2c, 0x0a, 0x3d, 0x37, 0x0b, 0x2e, 0x2d, 0x1f, 0x22, 0x31, 0x06, 0x07, 0x29, 0x22
+	.byte 0x17, 0x2d, 0x30, 0x11, 0x18, 0x0c, 0x19, 0x15, 0x07, 0x0a, 0x34, 0x18, 0x29, 0x27, 0x33, 0x0c, 0x30, 0x03, 0x1a, 0x37, 0x06, 0x01, 0x2d, 0x0f, 0x3b, 0x2b, 0x11, 0x1f, 0x37, 0x2b, 0x21, 0x36
+	.byte 0x3f, 0x23, 0x17, 0x17, 0x07, 0x2b, 0x2b, 0x0e, 0x30, 0x11, 0x39, 0x1d, 0x29, 0x03, 0x33, 0x30, 0x03, 0x2f, 0x3c, 0x20, 0x26, 0x03, 0x22, 0x14, 0x3a, 0x28, 0x35, 0x01, 0x28, 0x2b, 0x3e, 0x15
+	.byte 0x18, 0x30, 0x07, 0x17, 0x3b, 0x2c, 0x30, 0x15, 0x07, 0x2c, 0x17, 0x27, 0x1d, 0x3f, 0x1e, 0x33, 0x0d, 0x17, 0x10, 0x15, 0x0e, 0x30, 0x09, 0x05, 0x30, 0x2d, 0x20, 0x15, 0x3c, 0x3d, 0x30, 0x0c
+	.byte 0x17, 0x1c, 0x1a, 0x0d, 0x25, 0x2b, 0x2b, 0x2a, 0x02, 0x16, 0x2d, 0x17, 0x31, 0x17, 0x00, 0x08, 0x13, 0x37, 0x35, 0x21, 0x1e, 0x1c, 0x1f, 0x2b, 0x32, 0x1c, 0x10, 0x2a, 0x16, 0x3a, 0x33, 0x31
+	.byte 0x17, 0x2b, 0x2a, 0x0c, 0x3d, 0x11, 0x28, 0x0a, 0x30, 0x23, 0x0a, 0x26, 0x0a, 0x14, 0x24, 0x0b, 0x0f, 0x30, 0x1b, 0x1e, 0x29, 0x02, 0x35, 0x28, 0x3b, 0x02, 0x14, 0x00, 0x0f, 0x35, 0x1c, 0x3c
+	.byte 0x2e, 0x28, 0x38, 0x19, 0x1b, 0x11, 0x12, 0x09, 0x16, 0x10, 0x2e, 0x0d, 0x20, 0x3d, 0x04, 0x32, 0x16, 0x2c, 0x25, 0x02, 0x3d, 0x18, 0x0b, 0x13, 0x1c, 0x22, 0x2a, 0x1c, 0x20, 0x27, 0x22, 0x05
+	.byte 0x26, 0x22, 0x12, 0x1d, 0x2c, 0x08, 0x05, 0x2e, 0x3f, 0x1c, 0x17, 0x24, 0x0d, 0x33, 0x36, 0x08, 0x24, 0x10, 0x22, 0x29, 0x1c, 0x0a, 0x11, 0x25, 0x0f, 0x10, 0x24, 0x38, 0x2f, 0x25, 0x32, 0x1e
+	.byte 0x06, 0x2a, 0x29, 0x3e, 0x3a, 0x28, 0x34, 0x17, 0x33, 0x18, 0x33, 0x17, 0x07, 0x14, 0x1f, 0x11, 0x17, 0x20, 0x13, 0x0e, 0x14, 0x3b, 0x1c, 0x12, 0x2a, 0x13, 0x37, 0x2a, 0x35, 0x32, 0x30, 0x02
+	.byte 0x25, 0x00, 0x07, 0x1f, 0x0c, 0x04, 0x2c, 0x37, 0x37, 0x30, 0x25, 0x12, 0x25, 0x12, 0x22, 0x21, 0x22, 0x35, 0x33, 0x07, 0x20, 0x2d, 0x27, 0x0e, 0x30, 0x34, 0x19, 0x1a, 0x0a, 0x3c, 0x25, 0x07
+	.byte 0x1d, 0x2b, 0x31, 0x3a, 0x12, 0x1a, 0x3d, 0x37, 0x16, 0x15, 0x16, 0x39, 0x13, 0x15, 0x2d, 0x03, 0x2e, 0x06, 0x39, 0x2c, 0x16, 0x00, 0x13, 0x35, 0x2a, 0x35, 0x24, 0x01, 0x18, 0x24, 0x37, 0x28
+	.byte 0x25, 0x1b, 0x34, 0x25, 0x19, 0x17, 0x27, 0x2f, 0x1b, 0x27, 0x0d, 0x10, 0x36, 0x3c, 0x30, 0x3c, 0x33, 0x23, 0x3e, 0x27, 0x1e, 0x25, 0x2d, 0x29, 0x1f, 0x12, 0x21, 0x37, 0x32, 0x1f, 0x11, 0x21
+	.byte 0x35, 0x30, 0x0c, 0x19, 0x25, 0x3d, 0x26, 0x17, 0x02, 0x1d, 0x14, 0x2e, 0x11, 0x38, 0x13, 0x30, 0x0a, 0x2b, 0x20, 0x1e, 0x10, 0x15, 0x37, 0x30, 0x2e, 0x1e, 0x04, 0x2c, 0x14, 0x34, 0x19, 0x08
+	.byte 0x14, 0x18, 0x0e, 0x1c, 0x30, 0x1a, 0x2e, 0x1b, 0x1f, 0x39, 0x31, 0x0c, 0x1c, 0x28, 0x3e, 0x33, 0x23, 0x0f, 0x13, 0x16, 0x25, 0x39, 0x2f, 0x14, 0x1b, 0x1a, 0x28, 0x3e, 0x21, 0x2d, 0x19, 0x11
+	.byte 0x0c, 0x34, 0x32, 0x39, 0x31, 0x19, 0x1a, 0x08, 0x34, 0x09, 0x2f, 0x11, 0x30, 0x04, 0x1c, 0x02, 0x3b, 0x1b, 0x33, 0x21, 0x33, 0x38, 0x02, 0x1a, 0x31, 0x38, 0x32, 0x1f, 0x1d, 0x16, 0x17, 0x10
+	.byte 0x1b, 0x32, 0x20, 0x17, 0x00, 0x33, 0x12, 0x21, 0x0f, 0x27, 0x14, 0x19, 0x27, 0x24, 0x2c, 0x37, 0x25, 0x05, 0x2f, 0x3d, 0x25, 0x11, 0x12, 0x30, 0x1a, 0x16, 0x03, 0x1a, 0x14, 0x09, 0x13, 0x02
+	.byte 0x23, 0x22, 0x01, 0x3c, 0x10, 0x3f, 0x2d, 0x23, 0x31, 0x3f, 0x23, 0x17, 0x00, 0x33, 0x3f, 0x0f, 0x2f, 0x26, 0x07, 0x15, 0x21, 0x2b, 0x2a, 0x38, 0x39, 0x1e, 0x09, 0x25, 0x2b, 0x3b, 0x30, 0x25
+	.byte 0x12, 0x2d, 0x13, 0x32, 0x19, 0x28, 0x24, 0x1c, 0x2d, 0x35, 0x32, 0x26, 0x0d, 0x23, 0x1e, 0x1d, 0x07, 0x21, 0x0b, 0x34, 0x17, 0x2d, 0x32, 0x32, 0x3a, 0x3c, 0x35, 0x1a, 0x10, 0x33, 0x1a, 0x07
+	.byte 0x22, 0x3b, 0x1b, 0x2a, 0x33, 0x1f, 0x26, 0x0e, 0x35, 0x1a, 0x3b, 0x0a, 0x1c, 0x11, 0x07, 0x11, 0x0d, 0x3c, 0x2d, 0x1e, 0x37, 0x29, 0x11, 0x05, 0x12, 0x15, 0x2f, 0x1c, 0x24, 0x31, 0x16, 0x2b
+	.byte 0x21, 0x1b, 0x23, 0x10, 0x31, 0x02, 0x14, 0x29, 0x26, 0x20, 0x16, 0x10, 0x17, 0x10, 0x0b, 0x0f, 0x33, 0x01, 0x2e, 0x14, 0x21, 0x0e, 0x37, 0x1a, 0x1d, 0x2f, 0x1e, 0x30, 0x24, 0x04, 0x14, 0x2d
+	.byte 0x11, 0x00, 0x30, 0x08, 0x2a, 0x1d, 0x1d, 0x22, 0x21, 0x24, 0x2c, 0x37, 0x24, 0x11, 0x12, 0x04, 0x2e, 0x28, 0x1d, 0x18, 0x23, 0x3c, 0x16, 0x16, 0x10, 0x17, 0x31, 0x20, 0x21, 0x12, 0x33, 0x3e
+	.byte 0x34, 0x06, 0x13, 0x13, 0x17, 0x38, 0x2b, 0x14, 0x0d, 0x15, 0x24, 0x3b, 0x2b, 0x34, 0x3b, 0x1e, 0x18, 0x07, 0x34, 0x37, 0x1d, 0x1f, 0x0b, 0x29, 0x20, 0x12, 0x1e, 0x1d, 0x1a, 0x24, 0x24, 0x3d
+	.byte 0x28, 0x24, 0x0b, 0x12, 0x33, 0x1b, 0x3a, 0x22, 0x14, 0x13, 0x2a, 0x31, 0x38, 0x15, 0x37, 0x2b, 0x2e, 0x19, 0x1e, 0x2c, 0x3f, 0x1b, 0x2a, 0x33, 0x1f, 0x33, 0x3f, 0x15, 0x29, 0x01, 0x1e, 0x18
+	.byte 0x1f, 0x22, 0x19, 0x33, 0x3c, 0x34, 0x1e, 0x12, 0x22, 0x0d, 0x37, 0x2c, 0x0f, 0x08, 0x31, 0x2e, 0x09, 0x36, 0x01, 0x05, 0x1e, 0x1c, 0x04, 0x1e, 0x0c, 0x01, 0x1c, 0x29, 0x28, 0x2f, 0x39, 0x2d
+	.byte 0x14, 0x09, 0x22, 0x36, 0x04, 0x37, 0x37, 0x2d, 0x2f, 0x35, 0x24, 0x23, 0x1b, 0x08, 0x20, 0x32, 0x20, 0x1f, 0x34, 0x02, 0x31, 0x19, 0x18, 0x13, 0x36, 0x06, 0x2b, 0x1e, 0x0e, 0x1b, 0x10, 0x2f
+	.byte 0x0e, 0x1c, 0x11, 0x38, 0x13, 0x01, 0x37, 0x19, 0x14, 0x11, 0x26, 0x31, 0x3d, 0x33, 0x1d, 0x1b, 0x34, 0x25, 0x31, 0x2f, 0x11, 0x0a, 0x2f, 0x39, 0x17, 0x1b, 0x05, 0x0e, 0x13, 0x29, 0x25, 0x22
+	.byte 0x15, 0x0d, 0x20, 0x2b, 0x27, 0x21, 0x3e, 0x24, 0x27, 0x2a, 0x2b, 0x16, 0x24, 0x3d, 0x15, 0x15, 0x30, 0x31, 0x0f, 0x33, 0x24, 0x06, 0x16, 0x13, 0x06, 0x31, 0x10, 0x2e, 0x3f, 0x10, 0x05, 0x0d
+	.byte 0x2f, 0x3c, 0x1f, 0x19, 0x12, 0x13, 0x24, 0x0f, 0x33, 0x36, 0x15, 0x3b, 0x33, 0x03, 0x0f, 0x2a, 0x3b, 0x3c, 0x2c, 0x36, 0x09, 0x29, 0x11, 0x3b, 0x27, 0x28, 0x2b, 0x31, 0x1a, 0x0e, 0x2f, 0x39
+	.byte 0x2c, 0x31, 0x0e, 0x3c, 0x35, 0x2c, 0x24, 0x33, 0x3d, 0x11, 0x2b, 0x07, 0x3c, 0x37, 0x14, 0x18, 0x13, 0x1d, 0x3f, 0x2e, 0x30, 0x12, 0x25, 0x26, 0x1d, 0x11, 0x07, 0x11, 0x1e, 0x34, 0x01, 0x11
+	.byte 0x0b, 0x39, 0x21, 0x29, 0x02, 0x29, 0x15, 0x10, 0x1a, 0x30, 0x1f, 0x35, 0x3c, 0x2b, 0x2a, 0x30, 0x3b, 0x36, 0x20, 0x1a, 0x23, 0x32, 0x24, 0x2b, 0x15, 0x20, 0x1c, 0x25, 0x3d, 0x36, 0x2d, 0x14
+	.byte 0x31, 0x18, 0x23, 0x17, 0x18, 0x05, 0x13, 0x34, 0x30, 0x37, 0x0e, 0x39, 0x23, 0x1d, 0x1f, 0x17, 0x01, 0x15, 0x2f, 0x0b, 0x3e, 0x1b, 0x0d, 0x19, 0x2e, 0x31, 0x38, 0x1c, 0x15, 0x34, 0x15, 0x13
+	.byte 0x19, 0x29, 0x19, 0x14, 0x27, 0x15, 0x18, 0x23, 0x29, 0x0c, 0x27, 0x2d, 0x0e, 0x17, 0x34, 0x18, 0x10, 0x3b, 0x1e, 0x29, 0x34, 0x2c, 0x22, 0x31, 0x08, 0x13, 0x1d, 0x18, 0x1a, 0x1c, 0x0b, 0x2a
+	.byte 0x19, 0x1e, 0x1a, 0x23, 0x27, 0x17, 0x3b, 0x0e, 0x37, 0x19, 0x2b, 0x16, 0x2f, 0x08, 0x21, 0x37, 0x02, 0x20, 0x0b, 0x32, 0x30, 0x16, 0x05, 0x30, 0x13, 0x05, 0x1a, 0x07, 0x39, 0x19, 0x0c, 0x3b
+	.byte 0x2a, 0x15, 0x05, 0x30, 0x30, 0x05, 0x19, 0x13, 0x00, 0x12, 0x27, 0x16, 0x2a, 0x0f, 0x28, 0x27, 0x0c, 0x23, 0x2f, 0x39, 0x28, 0x2a, 0x24, 0x25, 0x1f, 0x18, 0x29, 0x14, 0x16, 0x05, 0x1a, 0x35
+	.byte 0x2f, 0x26, 0x0a, 0x3a, 0x29, 0x34, 0x2c, 0x36, 0x2e, 0x3a, 0x15, 0x1a, 0x0a, 0x2d, 0x16, 0x14, 0x2e, 0x35, 0x28, 0x2a, 0x35, 0x0f, 0x11, 0x11, 0x32, 0x19, 0x20, 0x1a, 0x28, 0x17, 0x1a, 0x28
+	.byte 0x16, 0x33, 0x25, 0x13, 0x2c, 0x29, 0x09, 0x16, 0x33, 0x1d, 0x27, 0x26, 0x15, 0x0c, 0x2f, 0x22, 0x1c, 0x19, 0x29, 0x33, 0x10, 0x2d, 0x11, 0x1b, 0x16, 0x19, 0x2e, 0x0d, 0x0c, 0x28, 0x37, 0x3a
+	.byte 0x34, 0x2a, 0x1d, 0x37, 0x30, 0x0a, 0x36, 0x24, 0x39, 0x1b, 0x39, 0x0a, 0x32, 0x11, 0x03, 0x2d, 0x32, 0x1d, 0x30, 0x38, 0x1e, 0x27, 0x2e, 0x17, 0x18, 0x16, 0x17, 0x2a, 0x36, 0x3b, 0x31, 0x17
+	.byte 0x04, 0x19, 0x3a, 0x25, 0x2d, 0x00, 0x36, 0x27, 0x25, 0x12, 0x33, 0x06, 0x0a, 0x14, 0x11, 0x05, 0x2f, 0x03, 0x35, 0x2f, 0x0b, 0x34, 0x29, 0x00, 0x31, 0x13, 0x27, 0x0f, 0x1c, 0x1d, 0x06, 0x2d
+	.byte 0x1c, 0x30, 0x27, 0x2f, 0x2a, 0x27, 0x16, 0x20, 0x31, 0x33, 0x2b, 0x2b, 0x05, 0x30, 0x36, 0x29, 0x23, 0x35, 0x10, 0x16, 0x2f, 0x2d, 0x20, 0x29, 0x37, 0x13, 0x24, 0x2d, 0x0e, 0x25, 0x08, 0x0a
+	.byte 0x18, 0x0f, 0x03, 0x1b, 0x31, 0x0c, 0x37, 0x1e, 0x34, 0x31, 0x1b, 0x0e, 0x25, 0x1a, 0x07, 0x34, 0x0d, 0x3c, 0x33, 0x00, 0x3a, 0x36, 0x04, 0x27, 0x12, 0x23, 0x18, 0x24, 0x0d, 0x0b, 0x18, 0x31
+	.byte 0x32, 0x37, 0x00, 0x0d, 0x21, 0x32, 0x10, 0x12, 0x26, 0x0d, 0x19, 0x29, 0x24, 0x2b, 0x3d, 0x21, 0x1f, 0x1e, 0x1b, 0x28, 0x0d, 0x12, 0x28, 0x35, 0x1e, 0x23, 0x0a, 0x2e, 0x22, 0x27, 0x27, 0x35
+	.byte 0x01, 0x0e, 0x20, 0x31, 0x39, 0x29, 0x3b, 0x24, 0x36, 0x14, 0x10, 0x33, 0x18, 0x2c, 0x26, 0x04, 0x2d, 0x15, 0x1a, 0x11, 0x37, 0x0f, 0x0b, 0x14, 0x0e, 0x2c, 0x2c, 0x21, 0x17, 0x2c, 0x16, 0x21
+	.byte 0x35, 0x3e, 0x10, 0x10, 0x0a, 0x05, 0x1e, 0x3b, 0x09, 0x13, 0x26, 0x18, 0x1e, 0x23, 0x0c, 0x1a, 0x33, 0x37, 0x1f, 0x09, 0x12, 0x35, 0x3d, 0x0d, 0x15, 0x36, 0x06, 0x24, 0x33, 0x30, 0x29, 0x3b
+	.byte 0x0f, 0x28, 0x34, 0x2a, 0x2c, 0x02, 0x12, 0x35, 0x09, 0x22, 0x31, 0x3b, 0x31, 0x1c, 0x33, 0x22, 0x27, 0x3d, 0x34, 0x15, 0x14, 0x22, 0x28, 0x28, 0x10, 0x1e, 0x21, 0x31, 0x10, 0x2d, 0x16, 0x21
+	.byte 0x1e, 0x05, 0x33, 0x0f, 0x30, 0x31, 0x0e, 0x1a, 0x35, 0x38, 0x2e, 0x28, 0x26, 0x37, 0x1e, 0x2b, 0x13, 0x33, 0x1f, 0x1e, 0x37, 0x0a, 0x28, 0x24, 0x32, 0x1c, 0x1a, 0x1f, 0x3f, 0x19, 0x39, 0x39
+	.byte 0x29, 0x2c, 0x1b, 0x14, 0x15, 0x2a, 0x17, 0x32, 0x0f, 0x21, 0x30, 0x21, 0x18, 0x23, 0x2a, 0x27, 0x3d, 0x07, 0x10, 0x0b, 0x3f, 0x2f, 0x31, 0x02, 0x2e, 0x08, 0x39, 0x2f, 0x3f, 0x20, 0x18, 0x2d
+	.byte 0x34, 0x11, 0x2e, 0x34, 0x10, 0x26, 0x12, 0x23, 0x25, 0x0a, 0x37, 0x34, 0x09, 0x25, 0x0a, 0x3e, 0x16, 0x1a, 0x17, 0x11, 0x38, 0x1c, 0x20, 0x11, 0x21, 0x26, 0x05, 0x0f, 0x18, 0x26, 0x2b, 0x32
+	.byte 0x0a, 0x0c, 0x16, 0x03, 0x29, 0x1d, 0x29, 0x3b, 0x23, 0x16, 0x1b, 0x29, 0x07, 0x09, 0x17, 0x17, 0x2c, 0x1c, 0x35, 0x33, 0x30, 0x17, 0x12, 0x1e, 0x3d, 0x1a, 0x2b, 0x21, 0x1d, 0x10, 0x0a, 0x08
+	.byte 0x17, 0x14, 0x3c, 0x36, 0x28, 0x36, 0x36, 0x3b, 0x20, 0x1b, 0x13, 0x22, 0x1d, 0x13, 0x3a, 0x15, 0x02, 0x23, 0x2c, 0x3e, 0x19, 0x14, 0x39, 0x3c, 0x1a, 0x10, 0x08, 0x1e, 0x0a, 0x13, 0x29, 0x3f
+	.byte 0x38, 0x2c, 0x07, 0x23, 0x1f, 0x19, 0x2a, 0x24, 0x14, 0x3c, 0x1f, 0x0d, 0x04, 0x37, 0x1a, 0x2f, 0x28, 0x2a, 0x1d, 0x1e, 0x11, 0x37, 0x29, 0x28, 0x27, 0x12, 0x0d, 0x00, 0x26, 0x0a, 0x3c, 0x26
+	.byte 0x1f, 0x1c, 0x33, 0x04, 0x3a, 0x2c, 0x24, 0x3d, 0x2b, 0x26, 0x31, 0x2f, 0x13, 0x1c, 0x21, 0x3e, 0x12, 0x23, 0x36, 0x0a, 0x1a, 0x2d, 0x1e, 0x19, 0x05, 0x1f, 0x1b, 0x1e, 0x0a, 0x1f, 0x20, 0x08
+	.byte 0x24, 0x2c, 0x0c, 0x33, 0x1d, 0x1f, 0x11, 0x0e, 0x12, 0x10, 0x27, 0x12, 0x19, 0x2a, 0x13, 0x31, 0x1c, 0x04, 0x30, 0x1a, 0x38, 0x1f, 0x2c, 0x35, 0x25, 0x07, 0x0b, 0x33, 0x2d, 0x02, 0x1a, 0x2a
+	.byte 0x35, 0x35, 0x16, 0x2f, 0x14, 0x11, 0x31, 0x33, 0x2c, 0x31, 0x1e, 0x3c, 0x3a, 0x27, 0x3c, 0x2b, 0x12, 0x27, 0x1d, 0x12, 0x36, 0x2c, 0x2b, 0x25, 0x3b, 0x35, 0x12, 0x3d, 0x27, 0x13, 0x23, 0x19
+	.byte 0x33, 0x2c, 0x26, 0x09, 0x3c, 0x12, 0x15, 0x1a, 0x23, 0x21, 0x07, 0x1a, 0x22, 0x25, 0x20, 0x19, 0x1b, 0x2c, 0x3a, 0x19, 0x35, 0x05, 0x26, 0x1d, 0x23, 0x22, 0x25, 0x0e, 0x1e, 0x11, 0x13, 0x30
+	.byte 0x12, 0x2c, 0x22, 0x25, 0x0a, 0x1d, 0x18, 0x23, 0x3e, 0x1d, 0x02, 0x28, 0x25, 0x21, 0x0e, 0x20, 0x21, 0x22, 0x37, 0x18, 0x33, 0x27, 0x23, 0x23, 0x31, 0x24, 0x1a, 0x1a, 0x3e, 0x25, 0x24, 0x24
+	.byte 0x01, 0x18, 0x34, 0x10, 0x22, 0x07, 0x00, 0x37, 0x06, 0x20, 0x20, 0x3a, 0x02, 0x2b, 0x07, 0x2c, 0x2c, 0x09, 0x2f, 0x2a, 0x01, 0x32, 0x2c, 0x00, 0x35, 0x13, 0x2b, 0x3c, 0x1f, 0x36, 0x37, 0x1e
+	.byte 0x20, 0x35, 0x1d, 0x0c, 0x07, 0x33, 0x16, 0x08, 0x12, 0x3f, 0x36, 0x11, 0x0b, 0x1f, 0x2d, 0x21, 0x20, 0x33, 0x17, 0x1a, 0x2e, 0x16, 0x01, 0x2f, 0x2f, 0x1c, 0x34, 0x29, 0x31, 0x2e, 0x3b, 0x38
+	.byte 0x31, 0x0d, 0x16, 0x12, 0x07, 0x29, 0x24, 0x33, 0x3c, 0x34, 0x3e, 0x1e, 0x18, 0x30, 0x02, 0x34, 0x2a, 0x34, 0x1b, 0x2e, 0x23, 0x18, 0x34, 0x00, 0x1f, 0x20, 0x0e, 0x28, 0x15, 0x33, 0x37, 0x27
+	.byte 0x35, 0x23, 0x37, 0x3e, 0x11, 0x32, 0x2e, 0x36, 0x3a, 0x02, 0x2b, 0x00, 0x36, 0x1d, 0x13, 0x29, 0x16, 0x08, 0x2b, 0x37, 0x08, 0x02, 0x27, 0x32, 0x2d, 0x34, 0x30, 0x36, 0x29, 0x2e, 0x10, 0x12
+	.byte 0x3c, 0x2e, 0x2a, 0x04, 0x33, 0x30, 0x3f, 0x01, 0x22, 0x37, 0x14, 0x1d, 0x27, 0x00, 0x2f, 0x0c, 0x39, 0x26, 0x27, 0x04, 0x21, 0x19, 0x08, 0x1d, 0x01, 0x04, 0x1e, 0x27, 0x1b, 0x2b, 0x31, 0x17
+	.byte 0x1f, 0x07, 0x01, 0x2d, 0x2e, 0x3b, 0x1f, 0x34, 0x24, 0x31, 0x32, 0x2b, 0x24, 0x0e, 0x07, 0x1e, 0x0f, 0x33, 0x10, 0x16, 0x21, 0x32, 0x39, 0x02, 0x1a, 0x33, 0x3d, 0x22, 0x0c, 0x25, 0x1a, 0x29
+	.byte 0x29, 0x28, 0x3a, 0x32, 0x26, 0x0b, 0x13, 0x22, 0x1f, 0x0f, 0x1c, 0x04, 0x2c, 0x20, 0x39, 0x1a, 0x1b, 0x1a, 0x2a, 0x1f, 0x24, 0x13, 0x1a, 0x31, 0x3b, 0x33, 0x39, 0x23, 0x28, 0x31, 0x07, 0x31
+	.byte 0x1f, 0x10, 0x20, 0x29, 0x17, 0x32, 0x26, 0x3b, 0x2d, 0x02, 0x3c, 0x1c, 0x0e, 0x00, 0x20, 0x14, 0x3e, 0x37, 0x01, 0x0f, 0x2d, 0x06, 0x12, 0x27, 0x30, 0x13, 0x19, 0x00, 0x33, 0x2a, 0x0c, 0x07
+	.byte 0x27, 0x11, 0x3a, 0x1c, 0x15, 0x0a, 0x13, 0x1f, 0x0d, 0x2a, 0x37, 0x07, 0x2a, 0x34, 0x35, 0x34, 0x28, 0x16, 0x27, 0x06, 0x02, 0x36, 0x09, 0x23, 0x30, 0x14, 0x02, 0x28, 0x39, 0x32, 0x34, 0x24
+	.byte 0x35, 0x12, 0x12, 0x22, 0x26, 0x09, 0x07, 0x33, 0x0f, 0x3e, 0x1e, 0x00, 0x3c, 0x33, 0x10, 0x37, 0x14, 0x3a, 0x03, 0x25, 0x2d, 0x1e, 0x24, 0x36, 0x36, 0x26, 0x1f, 0x3c, 0x1a, 0x37, 0x33, 0x25
+	.byte 0x23, 0x13, 0x1f, 0x33, 0x0d, 0x13, 0x25, 0x30, 0x1e, 0x17, 0x03, 0x18, 0x18, 0x18, 0x14, 0x30, 0x07, 0x22, 0x3e, 0x33, 0x21, 0x14, 0x37, 0x16, 0x16, 0x00, 0x12, 0x2c, 0x12, 0x2f, 0x25, 0x3f
+	.byte 0x1e, 0x24, 0x19, 0x16, 0x16, 0x0f, 0x35, 0x2d, 0x10, 0x11, 0x24, 0x2a, 0x28, 0x19, 0x25, 0x2e, 0x0c, 0x16, 0x1f, 0x38, 0x21, 0x36, 0x3d, 0x1a, 0x2f, 0x3b, 0x32, 0x12, 0x36, 0x13, 0x29, 0x0e
+	.byte 0x30, 0x31, 0x19, 0x07, 0x2f, 0x25, 0x23, 0x28, 0x20, 0x08, 0x29, 0x2a, 0x00, 0x30, 0x30, 0x38, 0x23, 0x1e, 0x0f, 0x1f, 0x3b, 0x1b, 0x30, 0x3a, 0x37, 0x2f, 0x39, 0x37, 0x35, 0x39, 0x2d, 0x2f
+	.byte 0x1f, 0x2e, 0x1e, 0x1a, 0x2b, 0x1e, 0x14, 0x17, 0x20, 0x2f, 0x03, 0x11, 0x1d, 0x00, 0x30, 0x17, 0x2b, 0x1d, 0x35, 0x28, 0x25, 0x3b, 0x0f, 0x11, 0x09, 0x04, 0x2e, 0x23, 0x11, 0x1e, 0x13, 0x37
+	.byte 0x1e, 0x37, 0x37, 0x1e, 0x07, 0x01, 0x32, 0x14, 0x06, 0x32, 0x11, 0x0c, 0x2e, 0x36, 0x2e, 0x24, 0x15, 0x2a, 0x1c, 0x22, 0x15, 0x34, 0x2c, 0x1e, 0x35, 0x22, 0x27, 0x33, 0x19, 0x3f, 0x2d, 0x21
+	.byte 0x33, 0x15, 0x26, 0x1a, 0x11, 0x16, 0x3e, 0x12, 0x2b, 0x24, 0x15, 0x3c, 0x0f, 0x2d, 0x31, 0x15, 0x36, 0x3f, 0x24, 0x1d, 0x25, 0x01, 0x37, 0x33, 0x16, 0x1a, 0x1f, 0x0e, 0x10, 0x2f, 0x0b, 0x12
+	.byte 0x2a, 0x1a, 0x25, 0x17, 0x0a, 0x35, 0x09, 0x28, 0x35, 0x02, 0x13, 0x36, 0x34, 0x2f, 0x17, 0x03, 0x04, 0x31, 0x3e, 0x26, 0x11, 0x35, 0x33, 0x31, 0x22, 0x17, 0x23, 0x1d, 0x05, 0x2b, 0x2e, 0x27
+	.byte 0x20, 0x03, 0x2b, 0x1d, 0x01, 0x19, 0x1e, 0x0e, 0x05, 0x18, 0x16, 0x25, 0x17, 0x02, 0x28, 0x18, 0x19, 0x0b, 0x24, 0x3e, 0x35, 0x16, 0x2e, 0x29, 0x25, 0x3e, 0x38, 0x1e, 0x3a, 0x2f, 0x12, 0x14
+	.byte 0x17, 0x2d, 0x11, 0x12, 0x30, 0x15, 0x31, 0x18, 0x08, 0x0b, 0x29, 0x2d, 0x00, 0x33, 0x2c, 0x06, 0x1a, 0x14, 0x1c, 0x2e, 0x04, 0x08, 0x12, 0x1b, 0x2b, 0x2d, 0x2a, 0x37, 0x33, 0x10, 0x27, 0x2c
+	.byte 0x1d, 0x0e, 0x34, 0x20, 0x02, 0x12, 0x1e, 0x1a, 0x2e, 0x07, 0x0b, 0x10, 0x36, 0x1e, 0x33, 0x2b, 0x28, 0x1b, 0x31, 0x25, 0x1f, 0x38, 0x3a, 0x2f, 0x39, 0x30, 0x2f, 0x12, 0x09, 0x14, 0x0e, 0x08
+	.byte 0x19, 0x00, 0x0d, 0x2c, 0x1b, 0x0e, 0x34, 0x11, 0x25, 0x15, 0x0c, 0x2d, 0x26, 0x36, 0x2c, 0x16, 0x31, 0x31, 0x2c, 0x03, 0x1a, 0x16, 0x1c, 0x32, 0x14, 0x0a, 0x3e, 0x36, 0x33, 0x1b, 0x27, 0x1f
+	.byte 0x32, 0x18, 0x33, 0x26, 0x33, 0x1a, 0x13, 0x1a, 0x0f, 0x34, 0x1c, 0x35, 0x2c, 0x2f, 0x38, 0x03, 0x18, 0x15, 0x0f, 0x27, 0x31, 0x29, 0x20, 0x28, 0x0e, 0x28, 0x31, 0x2c, 0x2e, 0x15, 0x19, 0x1b
+	.byte 0x10, 0x03, 0x2f, 0x2e, 0x2a, 0x32, 0x2a, 0x27, 0x1b, 0x36, 0x04, 0x1e, 0x3b, 0x04, 0x21, 0x07, 0x2f, 0x19, 0x27, 0x1d, 0x1d, 0x3c, 0x3d, 0x2e, 0x25, 0x08, 0x32, 0x3b, 0x34, 0x2a, 0x0c, 0x10
+	.byte 0x13, 0x25, 0x35, 0x1a, 0x2f, 0x19, 0x28, 0x17, 0x00, 0x2b, 0x0a, 0x1c, 0x17, 0x0a, 0x11, 0x1b, 0x35, 0x13, 0x37, 0x29, 0x1c, 0x28, 0x0c, 0x31, 0x35, 0x3c, 0x10, 0x1a, 0x1b, 0x3a, 0x2d, 0x3a
+	.byte 0x1c, 0x18, 0x22, 0x10, 0x2d, 0x1c, 0x3c, 0x12, 0x17, 0x18, 0x2a, 0x0b, 0x2b, 0x2f, 0x2d, 0x04, 0x2e, 0x3c, 0x13, 0x23, 0x01, 0x1c, 0x2e, 0x14, 0x16, 0x22, 0x0c, 0x24, 0x13, 0x35, 0x37, 0x34
+	.byte 0x1b, 0x30, 0x1e, 0x3a, 0x1c, 0x20, 0x06, 0x06, 0x36, 0x09, 0x15, 0x1a, 0x1b, 0x1a, 0x27, 0x0f, 0x33, 0x35, 0x37, 0x06, 0x23, 0x3a, 0x12, 0x1d, 0x00, 0x16, 0x29, 0x0e, 0x1d, 0x35, 0x3f, 0x38
+	.byte 0x16, 0x2a, 0x3c, 0x34, 0x13, 0x32, 0x10, 0x17, 0x2c, 0x37, 0x29, 0x2a, 0x1e, 0x35, 0x2f, 0x2d, 0x3c, 0x2a, 0x11, 0x28, 0x13, 0x21, 0x19, 0x1e, 0x34, 0x0c, 0x06, 0x2d, 0x09, 0x04, 0x1c, 0x1d
+	.byte 0x2f, 0x26, 0x39, 0x07, 0x16, 0x14, 0x04, 0x2d, 0x3a, 0x2f, 0x2e, 0x29, 0x15, 0x35, 0x24, 0x02, 0x36, 0x3f, 0x02, 0x1a, 0x0f, 0x18, 0x24, 0x16, 0x1d, 0x19, 0x14, 0x16, 0x10, 0x29, 0x1b, 0x13
+	.byte 0x15, 0x0e, 0x19, 0x3a, 0x2e, 0x2b, 0x08, 0x30, 0x15, 0x35, 0x16, 0x30, 0x2e, 0x18, 0x35, 0x3b, 0x0b, 0x1c, 0x3a, 0x18, 0x13, 0x29, 0x13, 0x1e, 0x20, 0x13, 0x27, 0x04, 0x1d, 0x34, 0x00, 0x38
+	.byte 0x19, 0x08, 0x39, 0x32, 0x20, 0x10, 0x26, 0x08, 0x02, 0x28, 0x3f, 0x0f, 0x16, 0x30, 0x1f, 0x19, 0x20, 0x2d, 0x10, 0x38, 0x17, 0x1c, 0x18, 0x31, 0x27, 0x33, 0x38, 0x30, 0x16, 0x33, 0x23, 0x00
+	.byte 0x01, 0x36, 0x0d, 0x02, 0x23, 0x39, 0x04, 0x1f, 0x0e, 0x30, 0x24, 0x06, 0x01, 0x2c, 0x34, 0x33, 0x35, 0x16, 0x34, 0x2e, 0x32, 0x16, 0x24, 0x26, 0x39, 0x34, 0x1f, 0x3c, 0x1d, 0x28, 0x1d, 0x37
+	.byte 0x17, 0x15, 0x2b, 0x27, 0x39, 0x30, 0x0b, 0x1b, 0x18, 0x35, 0x20, 0x2d, 0x0b, 0x35, 0x1c, 0x03, 0x0e, 0x21, 0x06, 0x0c, 0x20, 0x02, 0x18, 0x34, 0x1e, 0x36, 0x2d, 0x16, 0x0c, 0x19, 0x25, 0x09
+	.byte 0x2c, 0x37, 0x05, 0x2e, 0x2e, 0x2b, 0x2c, 0x24, 0x1a, 0x14, 0x27, 0x04, 0x10, 0x32, 0x38, 0x33, 0x37, 0x15, 0x35, 0x11, 0x3f, 0x1d, 0x23, 0x23, 0x1f, 0x29, 0x3f, 0x1d, 0x1a, 0x3c, 0x2b, 0x1b
+	.byte 0x2c, 0x2c, 0x38, 0x3b, 0x36, 0x04, 0x13, 0x33, 0x2c, 0x14, 0x12, 0x1a, 0x09, 0x1b, 0x36, 0x11, 0x24, 0x3a, 0x3f, 0x11, 0x01, 0x0e, 0x2b, 0x3b, 0x03, 0x2a, 0x08, 0x0d, 0x2b, 0x2b, 0x13, 0x27
+	.byte 0x3a, 0x3c, 0x1c, 0x3a, 0x15, 0x2a, 0x24, 0x00, 0x17, 0x3e, 0x0a, 0x15, 0x0c, 0x29, 0x2d, 0x1f, 0x15, 0x30, 0x35, 0x18, 0x19, 0x3d, 0x37, 0x37, 0x12, 0x38, 0x1b, 0x3b, 0x02, 0x20, 0x08, 0x21
+	.byte 0x19, 0x2e, 0x36, 0x1d, 0x15, 0x3d, 0x24, 0x22, 0x0c, 0x27, 0x36, 0x3f, 0x33, 0x33, 0x12, 0x11, 0x1a, 0x19, 0x1f, 0x2b, 0x24, 0x12, 0x11, 0x2a, 0x18, 0x25, 0x32, 0x2a, 0x2c, 0x1a, 0x12, 0x26
+	.byte 0x06, 0x10, 0x11, 0x29, 0x33, 0x2c, 0x09, 0x14, 0x2b, 0x12, 0x2b, 0x1d, 0x03, 0x24, 0x00, 0x12, 0x15, 0x22, 0x3d, 0x26, 0x15, 0x37, 0x1a, 0x0f, 0x12, 0x37, 0x24, 0x01, 0x18, 0x2a, 0x17, 0x13
+	.byte 0x14, 0x3b, 0x29, 0x2a, 0x19, 0x32, 0x2d, 0x17, 0x17, 0x0b, 0x2c, 0x33, 0x07, 0x2d, 0x34, 0x07, 0x38, 0x1d, 0x1f, 0x36, 0x22, 0x11, 0x0a, 0x17, 0x14, 0x11, 0x13, 0x2a, 0x17, 0x25, 0x01, 0x3a
+	.byte 0x1c, 0x26, 0x27, 0x30, 0x2d, 0x3b, 0x35, 0x3a, 0x30, 0x34, 0x06, 0x3a, 0x1c, 0x2d, 0x05, 0x13, 0x21, 0x32, 0x12, 0x3e, 0x1e, 0x2c, 0x3a, 0x3f, 0x2d, 0x20, 0x2a, 0x34, 0x26, 0x03, 0x1a, 0x19
+	.byte 0x27, 0x2e, 0x31, 0x04, 0x26, 0x2a, 0x3f, 0x30, 0x25, 0x23, 0x2a, 0x08, 0x08, 0x35, 0x2c, 0x30, 0x1e, 0x08, 0x05, 0x18, 0x06, 0x09, 0x2d, 0x19, 0x00, 0x27, 0x0d, 0x10, 0x19, 0x1c, 0x00, 0x13
+	.byte 0x3d, 0x0b, 0x24, 0x2e, 0x1f, 0x16, 0x3d, 0x18, 0x34, 0x12, 0x1e, 0x15, 0x15, 0x39, 0x25, 0x33, 0x0f, 0x17, 0x1a, 0x1c, 0x1b, 0x37, 0x29, 0x1b, 0x3b, 0x38, 0x12, 0x1d, 0x22, 0x34, 0x26, 0x0a
+	.byte 0x31, 0x16, 0x2d, 0x13, 0x0d, 0x20, 0x27, 0x24, 0x1d, 0x16, 0x2e, 0x2b, 0x18, 0x16, 0x2a, 0x1b, 0x24, 0x17, 0x36, 0x02, 0x05, 0x2b, 0x37, 0x1a, 0x17, 0x11, 0x3d, 0x2c, 0x1e, 0x2f, 0x22, 0x2c
+	.byte 0x29, 0x1a, 0x2f, 0x04, 0x25, 0x36, 0x0c, 0x35, 0x30, 0x3e, 0x12, 0x11, 0x30, 0x37, 0x12, 0x21, 0x2e, 0x21, 0x30, 0x17, 0x2c, 0x3d, 0x24, 0x11, 0x23, 0x14, 0x1a, 0x32, 0x17, 0x39, 0x27, 0x18
+	.byte 0x0f, 0x24, 0x19, 0x00, 0x3d, 0x37, 0x2c, 0x3c, 0x1c, 0x0b, 0x39, 0x23, 0x0e, 0x04, 0x1f, 0x1c, 0x31, 0x14, 0x00, 0x04, 0x15, 0x26, 0x2a, 0x2a, 0x20, 0x25, 0x2a, 0x0b, 0x3c, 0x33, 0x11, 0x0b
+	.byte 0x2e, 0x37, 0x22, 0x2e, 0x0e, 0x22, 0x26, 0x18, 0x2d, 0x27, 0x06, 0x0c, 0x1c, 0x26, 0x18, 0x2f, 0x3a, 0x01, 0x2a, 0x2f, 0x31, 0x34, 0x1f, 0x34, 0x1a, 0x31, 0x05, 0x10, 0x2e, 0x17, 0x34, 0x18
+	.byte 0x22, 0x23, 0x23, 0x21, 0x32, 0x07, 0x08, 0x22, 0x26, 0x1c, 0x22, 0x31, 0x12, 0x2f, 0x08, 0x1f, 0x10, 0x27, 0x15, 0x2a, 0x1f, 0x0b, 0x26, 0x2f, 0x14, 0x35, 0x24, 0x1f, 0x26, 0x3b, 0x23, 0x33
+	.byte 0x20, 0x3e, 0x2d, 0x17, 0x0c, 0x15, 0x13, 0x39, 0x1a, 0x30, 0x14, 0x25, 0x09, 0x07, 0x17, 0x38, 0x38, 0x1f, 0x29, 0x24, 0x27, 0x17, 0x27, 0x28, 0x1b, 0x12, 0x2a, 0x2b, 0x3d, 0x2d, 0x19, 0x34
+	.byte 0x1c, 0x01, 0x1d, 0x10, 0x08, 0x39, 0x11, 0x0e, 0x36, 0x1b, 0x26, 0x13, 0x10, 0x16, 0x28, 0x1e, 0x3c, 0x28, 0x17, 0x3e, 0x39, 0x34, 0x0a, 0x03, 0x2e, 0x37, 0x1a, 0x13, 0x2b, 0x33, 0x26, 0x13
+	.byte 0x2c, 0x21, 0x25, 0x14, 0x10, 0x16, 0x0b, 0x35, 0x1d, 0x35, 0x33, 0x21, 0x08, 0x33, 0x28, 0x21, 0x1a, 0x12, 0x0c, 0x1b, 0x36, 0x2a, 0x19, 0x2c, 0x2b, 0x23, 0x01, 0x0f, 0x26, 0x17, 0x0c, 0x18
+	.byte 0x09, 0x0f, 0x11, 0x2b, 0x24, 0x1c, 0x09, 0x09, 0x15, 0x36, 0x08, 0x13, 0x20, 0x39, 0x21, 0x00, 0x3a, 0x1f, 0x2b, 0x36, 0x31, 0x02, 0x37, 0x13, 0x04, 0x34, 0x35, 0x37, 0x3d, 0x1a, 0x17, 0x3d
+	.byte 0x13, 0x2b, 0x36, 0x2f, 0x13, 0x1e, 0x13, 0x3e, 0x11, 0x33, 0x27, 0x3a, 0x2d, 0x1e, 0x31, 0x1a, 0x03, 0x03, 0x2d, 0x25, 0x37, 0x1f, 0x11, 0x01, 0x22, 0x1c, 0x12, 0x17, 0x30, 0x3a, 0x30, 0x17
+	.byte 0x1d, 0x29, 0x0e, 0x13, 0x27, 0x1a, 0x2e, 0x24, 0x2d, 0x00, 0x1c, 0x17, 0x28, 0x1d, 0x09, 0x1f, 0x2e, 0x1a, 0x2d, 0x26, 0x0a, 0x13, 0x32, 0x3e, 0x00, 0x27, 0x0b, 0x3b, 0x30, 0x08, 0x3a, 0x2d
+	.byte 0x22, 0x12, 0x1e, 0x34, 0x1d, 0x2b, 0x26, 0x22, 0x35, 0x17, 0x2c, 0x17, 0x29, 0x13, 0x2d, 0x2d, 0x10, 0x10, 0x20, 0x31, 0x23, 0x1e, 0x33, 0x18, 0x33, 0x06, 0x2d, 0x26, 0x14, 0x27, 0x22, 0x1d
+	.byte 0x2a, 0x2d, 0x06, 0x18, 0x07, 0x09, 0x2e, 0x21, 0x15, 0x2e, 0x21, 0x38, 0x23, 0x35, 0x0b, 0x34, 0x24, 0x0b, 0x22, 0x1e, 0x01, 0x17, 0x0b, 0x24, 0x11, 0x17, 0x07, 0x20, 0x14, 0x25, 0x32, 0x1a
+	.byte 0x0e, 0x2f, 0x35, 0x17, 0x1f, 0x0c, 0x08, 0x21, 0x30, 0x35, 0x1f, 0x0c, 0x0b, 0x20, 0x04, 0x10, 0x11, 0x35, 0x11, 0x1e, 0x33, 0x3d, 0x16, 0x1e, 0x2b, 0x1d, 0x1a, 0x19, 0x10, 0x04, 0x06, 0x22
+	.byte 0x03, 0x3d, 0x24, 0x2a, 0x0e, 0x35, 0x03, 0x3e, 0x17, 0x0b, 0x18, 0x36, 0x3d, 0x0d, 0x26, 0x35, 0x12, 0x20, 0x1f, 0x0d, 0x16, 0x23, 0x32, 0x1a, 0x00, 0x3d, 0x26, 0x30, 0x19, 0x36, 0x12, 0x0e
+	.byte 0x23, 0x01, 0x23, 0x28, 0x3b, 0x31, 0x11, 0x2d, 0x1c, 0x36, 0x2a, 0x05, 0x16, 0x14, 0x0e, 0x30, 0x3a, 0x37, 0x19, 0x1f, 0x30, 0x25, 0x10, 0x26, 0x2f, 0x22, 0x11, 0x1f, 0x2e, 0x2b, 0x1e, 0x16
+	.byte 0x16, 0x21, 0x32, 0x18, 0x35, 0x23, 0x32, 0x1a, 0x3d, 0x0d, 0x19, 0x39, 0x09, 0x23, 0x30, 0x2e, 0x24, 0x1e, 0x0f, 0x24, 0x09, 0x21, 0x31, 0x05, 0x03, 0x11, 0x05, 0x22, 0x2a, 0x03, 0x07, 0x37
+	.byte 0x04, 0x08, 0x13, 0x05, 0x10, 0x34, 0x37, 0x14, 0x29, 0x0a, 0x24, 0x32, 0x34, 0x1e, 0x1b, 0x12, 0x17, 0x2e, 0x01, 0x02, 0x13, 0x0a, 0x0c, 0x11, 0x02, 0x14, 0x13, 0x0d, 0x25, 0x23, 0x00, 0x07
+	.byte 0x1a, 0x1c, 0x28, 0x35, 0x08, 0x0e, 0x2c, 0x1b, 0x3c, 0x15, 0x1c, 0x19, 0x1d, 0x32, 0x13, 0x1a, 0x1c, 0x00, 0x37, 0x22, 0x1b, 0x35, 0x39, 0x3e, 0x14, 0x32, 0x06, 0x31, 0x17, 0x05, 0x2b, 0x01
+	.byte 0x0f, 0x20, 0x1e, 0x0f, 0x34, 0x18, 0x03, 0x1f, 0x2b, 0x00, 0x14, 0x15, 0x3a, 0x30, 0x25, 0x30, 0x21, 0x0b, 0x00, 0x37, 0x24, 0x37, 0x1d, 0x29, 0x21, 0x16, 0x24, 0x0f, 0x2c, 0x3e, 0x15, 0x36
+	.byte 0x3c, 0x2d, 0x23, 0x3d, 0x3c, 0x17, 0x1a, 0x1c, 0x13, 0x0a, 0x29, 0x22, 0x25, 0x3f, 0x26, 0x3b, 0x39, 0x2f, 0x1d, 0x08, 0x16, 0x0b, 0x19, 0x14, 0x12, 0x01, 0x2c, 0x35, 0x11, 0x2a, 0x02, 0x00
+	.byte 0x13, 0x39, 0x2a, 0x35, 0x07, 0x1a, 0x11, 0x24, 0x0e, 0x1e, 0x0e, 0x2c, 0x15, 0x08, 0x31, 0x1b, 0x21, 0x1d, 0x26, 0x1d, 0x1c, 0x2a, 0x1d, 0x24, 0x13, 0x01, 0x00, 0x18, 0x28, 0x2a, 0x37, 0x15
+	.byte 0x0f, 0x13, 0x10, 0x32, 0x36, 0x22, 0x13, 0x31, 0x13, 0x05, 0x1e, 0x17, 0x35, 0x35, 0x3b, 0x0e, 0x24, 0x35, 0x3a, 0x1d, 0x1b, 0x36, 0x1b, 0x03, 0x1d, 0x24, 0x0f, 0x16, 0x30, 0x2d, 0x09, 0x25
+	.byte 0x05, 0x21, 0x13, 0x0a, 0x27, 0x36, 0x04, 0x0d, 0x1c, 0x06, 0x3e, 0x21, 0x2a, 0x27, 0x33, 0x28, 0x0e, 0x15, 0x0b, 0x17, 0x1d, 0x1d, 0x32, 0x2d, 0x08, 0x3d, 0x29, 0x21, 0x32, 0x17, 0x33, 0x31
+	.byte 0x22, 0x0e, 0x03, 0x21, 0x0d, 0x0b, 0x16, 0x3e, 0x2a, 0x2e, 0x19, 0x36, 0x2a, 0x0d, 0x00, 0x14, 0x22, 0x07, 0x36, 0x0a, 0x09, 0x15, 0x14, 0x10, 0x22, 0x07, 0x16, 0x2c, 0x36, 0x13, 0x15, 0x09
+	.byte 0x2f, 0x1b, 0x20, 0x3b, 0x2e, 0x3a, 0x3a, 0x16, 0x0d, 0x15, 0x2a, 0x39, 0x13, 0x2b, 0x0b, 0x01, 0x2a, 0x13, 0x17, 0x1e, 0x08, 0x17, 0x1e, 0x0c, 0x0f, 0x34, 0x1f, 0x31, 0x12, 0x07, 0x3a, 0x1d
+	.byte 0x35, 0x1e, 0x12, 0x24, 0x2c, 0x15, 0x0e, 0x21, 0x19, 0x34, 0x3b, 0x33, 0x19, 0x0f, 0x28, 0x10, 0x2f, 0x2e, 0x23, 0x27, 0x31, 0x39, 0x2e, 0x18, 0x3c, 0x3f, 0x24, 0x07, 0x23, 0x30, 0x28, 0x13
+	.byte 0x35, 0x13, 0x0a, 0x10, 0x35, 0x19, 0x33, 0x23, 0x28, 0x29, 0x13, 0x2f, 0x1a, 0x3a, 0x19, 0x14, 0x37, 0x36, 0x26, 0x20, 0x3b, 0x15, 0x37, 0x39, 0x10, 0x3c, 0x21, 0x34, 0x1c, 0x38, 0x30, 0x15
+	.byte 0x07, 0x26, 0x27, 0x21, 0x19, 0x18, 0x11, 0x23, 0x30, 0x28, 0x37, 0x32, 0x2d, 0x1f, 0x2c, 0x3f, 0x30, 0x1d, 0x2f, 0x26, 0x01, 0x11, 0x1c, 0x3b, 0x0f, 0x12, 0x2a, 0x17, 0x27, 0x05, 0x00, 0x1b
+	.byte 0x25, 0x1c, 0x32, 0x04, 0x22, 0x2d, 0x10, 0x0f, 0x25, 0x0d, 0x39, 0x30, 0x0b, 0x2e, 0x27, 0x2d, 0x34, 0x15, 0x3e, 0x30, 0x36, 0x16, 0x26, 0x2a, 0x05, 0x3f, 0x2b, 0x20, 0x3b, 0x2e, 0x3b, 0x1c
+	.byte 0x2f, 0x01, 0x18, 0x16, 0x16, 0x3d, 0x10, 0x0a, 0x1f, 0x18, 0x17, 0x0f, 0x22, 0x06, 0x13, 0x11, 0x38, 0x21, 0x17, 0x17, 0x0a, 0x37, 0x1c, 0x19, 0x30, 0x16, 0x38, 0x31, 0x30, 0x10, 0x36, 0x31
+	.byte 0x2f, 0x26, 0x3c, 0x1b, 0x23, 0x33, 0x2f, 0x19, 0x16, 0x35, 0x25, 0x3a, 0x18, 0x1f, 0x37, 0x01, 0x1e, 0x0d, 0x18, 0x12, 0x1f, 0x1c, 0x1b, 0x07, 0x34, 0x2d, 0x0b, 0x3f, 0x33, 0x1e, 0x34, 0x1d
+	.byte 0x2c, 0x13, 0x2c, 0x20, 0x20, 0x13, 0x20, 0x0f, 0x31, 0x08, 0x0f, 0x24, 0x18, 0x3d, 0x1c, 0x36, 0x34, 0x27, 0x33, 0x2a, 0x25, 0x2d, 0x30, 0x26, 0x3d, 0x37, 0x26, 0x25, 0x11, 0x11, 0x03, 0x05
+	.byte 0x18, 0x10, 0x04, 0x29, 0x07, 0x2e, 0x36, 0x2a, 0x29, 0x15, 0x3a, 0x0e, 0x33, 0x2a, 0x06, 0x29, 0x3d, 0x01, 0x29, 0x27, 0x0e, 0x16, 0x1d, 0x28, 0x1b, 0x10, 0x33, 0x2b, 0x0c, 0x14, 0x1d, 0x15
+	.byte 0x3f, 0x25, 0x37, 0x23, 0x1e, 0x04, 0x2c, 0x1c, 0x15, 0x34, 0x2a, 0x09, 0x2f, 0x15, 0x02, 0x3f, 0x14, 0x19, 0x2c, 0x33, 0x39, 0x32, 0x20, 0x2a, 0x18, 0x32, 0x17, 0x23, 0x21, 0x0b, 0x2d, 0x25
+	.byte 0x24, 0x3a, 0x2d, 0x31, 0x3f, 0x34, 0x18, 0x19, 0x24, 0x1e, 0x15, 0x1a, 0x17, 0x33, 0x2b, 0x23, 0x09, 0x26, 0x1b, 0x0d, 0x15, 0x36, 0x26, 0x28, 0x3a, 0x1c, 0x14, 0x0c, 0x3e, 0x10, 0x18, 0x06
+	.byte 0x35, 0x37, 0x26, 0x36, 0x21, 0x26, 0x17, 0x3d, 0x1c, 0x2c, 0x16, 0x25, 0x1d, 0x1e, 0x0b, 0x1e, 0x1d, 0x0d, 0x32, 0x08, 0x1f, 0x1b, 0x12, 0x1c, 0x12, 0x20, 0x2a, 0x28, 0x06, 0x3b, 0x35, 0x39
+	.byte 0x0e, 0x1e, 0x31, 0x30, 0x28, 0x02, 0x21, 0x14, 0x06, 0x1e, 0x29, 0x16, 0x09, 0x1c, 0x27, 0x32, 0x2d, 0x39, 0x03, 0x27, 0x29, 0x09, 0x1e, 0x1b, 0x11, 0x1c, 0x28, 0x3a, 0x2c, 0x03, 0x03, 0x18
+	.byte 0x23, 0x09, 0x2f, 0x30, 0x17, 0x23, 0x0f, 0x25, 0x33, 0x06, 0x24, 0x37, 0x22, 0x09, 0x33, 0x2c, 0x09, 0x2a, 0x0c, 0x12, 0x2a, 0x28, 0x20, 0x10, 0x15, 0x29, 0x33, 0x0f, 0x1a, 0x13, 0x13, 0x18
+	.byte 0x36, 0x2e, 0x16, 0x13, 0x3c, 0x1a, 0x15, 0x3a, 0x11, 0x32, 0x02, 0x0a, 0x2c, 0x19, 0x39, 0x11, 0x31, 0x3e, 0x1d, 0x32, 0x14, 0x32, 0x12, 0x2e, 0x34, 0x3e, 0x36, 0x23, 0x37, 0x3e, 0x15, 0x15
+	.byte 0x35, 0x34, 0x01, 0x3a, 0x2c, 0x26, 0x25, 0x22, 0x01, 0x2b, 0x37, 0x1c, 0x3d, 0x33, 0x3e, 0x10, 0x1c, 0x26, 0x33, 0x19, 0x05, 0x19, 0x17, 0x12, 0x38, 0x1c, 0x15, 0x3c, 0x32, 0x3f, 0x0f, 0x37
+	.byte 0x02, 0x39, 0x32, 0x13, 0x00, 0x1d, 0x1d, 0x2c, 0x10, 0x39, 0x13, 0x31, 0x0f, 0x37, 0x19, 0x09, 0x0d, 0x2a, 0x20, 0x2f, 0x32, 0x3b, 0x34, 0x22, 0x26, 0x14, 0x10, 0x24, 0x3d, 0x22, 0x0b, 0x31
+	.byte 0x23, 0x2f, 0x2d, 0x2a, 0x30, 0x04, 0x35, 0x19, 0x20, 0x2a, 0x16, 0x36, 0x37, 0x14, 0x28, 0x37, 0x11, 0x0b, 0x27, 0x1d, 0x06, 0x29, 0x35, 0x16, 0x2e, 0x24, 0x2e, 0x29, 0x36, 0x14, 0x2a, 0x21
+	.byte 0x0c, 0x1f, 0x3f, 0x39, 0x19, 0x27, 0x10, 0x2a, 0x1e, 0x12, 0x34, 0x10, 0x24, 0x34, 0x1d, 0x13, 0x1d, 0x17, 0x16, 0x37, 0x27, 0x1b, 0x27, 0x07, 0x24, 0x21, 0x37, 0x21, 0x11, 0x37, 0x28, 0x24
+	.byte 0x19, 0x02, 0x1c, 0x14, 0x12, 0x1d, 0x1b, 0x24, 0x2e, 0x2e, 0x3a, 0x15, 0x37, 0x34, 0x21, 0x33, 0x2d, 0x29, 0x2f, 0x1e, 0x34, 0x29, 0x3c, 0x12, 0x05, 0x15, 0x20, 0x05, 0x3e, 0x19, 0x18, 0x0b
+	.byte 0x30, 0x2f, 0x02, 0x27, 0x14, 0x1c, 0x34, 0x12, 0x20, 0x30, 0x2b, 0x22, 0x1b, 0x06, 0x31, 0x28, 0x15, 0x2d, 0x12, 0x01, 0x0e, 0x13, 0x13, 0x0c, 0x28, 0x07, 0x2a, 0x14, 0x1d, 0x36, 0x14, 0x15
+	.byte 0x2b, 0x26, 0x03, 0x25, 0x15, 0x3e, 0x3b, 0x20, 0x35, 0x0c, 0x25, 0x2b, 0x16, 0x35, 0x1e, 0x31, 0x2c, 0x06, 0x03, 0x29, 0x24, 0x07, 0x1f, 0x32, 0x2f, 0x19, 0x25, 0x21, 0x31, 0x22, 0x26, 0x1d
+	.byte 0x00, 0x1b, 0x18, 0x2a, 0x24, 0x31, 0x20, 0x06, 0x2f, 0x1e, 0x32, 0x26, 0x32, 0x39, 0x12, 0x20, 0x01, 0x19, 0x0f, 0x15, 0x15, 0x27, 0x10, 0x2e, 0x09, 0x25, 0x19, 0x29, 0x37, 0x30, 0x13, 0x1c
+	.byte 0x1d, 0x29, 0x2d, 0x26, 0x02, 0x1a, 0x16, 0x1d, 0x2b, 0x1c, 0x18, 0x04, 0x34, 0x28, 0x2a, 0x21, 0x15, 0x1b, 0x2e, 0x16, 0x01, 0x10, 0x05, 0x09, 0x14, 0x22, 0x03, 0x22, 0x02, 0x1b, 0x34, 0x29
+	.byte 0x2a, 0x23, 0x26, 0x36, 0x13, 0x23, 0x3d, 0x1a, 0x1d, 0x10, 0x24, 0x25, 0x2b, 0x37, 0x19, 0x24, 0x26, 0x28, 0x13, 0x16, 0x17, 0x14, 0x19, 0x0b, 0x2f, 0x25, 0x37, 0x34, 0x37, 0x39, 0x21, 0x1b
+	.byte 0x0f, 0x3d, 0x2d, 0x0d, 0x10, 0x20, 0x05, 0x0b, 0x2d, 0x01, 0x12, 0x24, 0x18, 0x3d, 0x32, 0x09, 0x21, 0x26, 0x1a, 0x0e, 0x1f, 0x30, 0x06, 0x1f, 0x0b, 0x3c, 0x29, 0x07, 0x3e, 0x27, 0x13, 0x1e
+	.byte 0x1a, 0x13, 0x07, 0x23, 0x10, 0x34, 0x1e, 0x32, 0x17, 0x23, 0x35, 0x16, 0x31, 0x32, 0x2e, 0x1b, 0x28, 0x0e, 0x22, 0x14, 0x3a, 0x23, 0x22, 0x03, 0x29, 0x2a, 0x10, 0x20, 0x3e, 0x3c, 0x27, 0x16
+	.byte 0x20, 0x12, 0x3f, 0x24, 0x31, 0x0d, 0x2e, 0x32, 0x2f, 0x17, 0x2d, 0x36, 0x3b, 0x17, 0x24, 0x23, 0x18, 0x37, 0x1d, 0x13, 0x17, 0x3a, 0x1a, 0x0a, 0x3d, 0x1e, 0x05, 0x12, 0x16, 0x33, 0x32, 0x25
+	.byte 0x1d, 0x1f, 0x29, 0x34, 0x2c, 0x26, 0x20, 0x29, 0x35, 0x0e, 0x32, 0x17, 0x01, 0x39, 0x2d, 0x27, 0x24, 0x23, 0x28, 0x3f, 0x18, 0x39, 0x38, 0x25, 0x23, 0x11, 0x11, 0x19, 0x2c, 0x29, 0x30, 0x08
+	.byte 0x28, 0x25, 0x27, 0x1d, 0x17, 0x25, 0x21, 0x09, 0x3d, 0x16, 0x1b, 0x0f, 0x2c, 0x1b, 0x12, 0x22, 0x28, 0x3e, 0x26, 0x34, 0x10, 0x1b, 0x02, 0x34, 0x15, 0x1a, 0x29, 0x19, 0x29, 0x11, 0x31, 0x12
+	.byte 0x27, 0x17, 0x27, 0x27, 0x2f, 0x34, 0x27, 0x24, 0x03, 0x19, 0x36, 0x17, 0x1d, 0x33, 0x19, 0x25, 0x1a, 0x2b, 0x39, 0x13, 0x3b, 0x33, 0x1d, 0x27, 0x31, 0x34, 0x28, 0x33, 0x37, 0x09, 0x30, 0x1b
+	.byte 0x03, 0x3a, 0x27, 0x19, 0x11, 0x1f, 0x0b, 0x1a, 0x34, 0x3d, 0x2a, 0x15, 0x04, 0x24, 0x36, 0x30, 0x23, 0x30, 0x0f, 0x22, 0x1b, 0x3d, 0x3d, 0x24, 0x29, 0x1d, 0x12, 0x16, 0x19, 0x2e, 0x03, 0x12
+	.byte 0x17, 0x18, 0x25, 0x33, 0x2f, 0x23, 0x1a, 0x1a, 0x35, 0x27, 0x21, 0x26, 0x19, 0x1b, 0x30, 0x18, 0x2b, 0x22, 0x2d, 0x2c, 0x1a, 0x34, 0x3e, 0x12, 0x19, 0x28, 0x27, 0x15, 0x1b, 0x11, 0x12, 0x17
+	.byte 0x15, 0x10, 0x34, 0x37, 0x25, 0x12, 0x3f, 0x15, 0x31, 0x0d, 0x37, 0x3e, 0x2a, 0x2d, 0x0f, 0x24, 0x24, 0x3c, 0x3f, 0x1f, 0x1d, 0x34, 0x17, 0x1a, 0x23, 0x1f, 0x37, 0x0f, 0x10, 0x32, 0x34, 0x35
+	.byte 0x19, 0x05, 0x22, 0x33, 0x16, 0x34, 0x1e, 0x14, 0x1e, 0x08, 0x13, 0x29, 0x3a, 0x37, 0x30, 0x1d, 0x36, 0x15, 0x29, 0x2e, 0x1d, 0x32, 0x2e, 0x23, 0x35, 0x17, 0x1c, 0x36, 0x1d, 0x13, 0x23, 0x34
+	.byte 0x34, 0x24, 0x1a, 0x37, 0x2f, 0x26, 0x2e, 0x1e, 0x17, 0x1a, 0x1f, 0x15, 0x1f, 0x2b, 0x1f, 0x19, 0x0a, 0x33, 0x1a, 0x35, 0x31, 0x24, 0x2d, 0x17, 0x2c, 0x0c, 0x21, 0x36, 0x2c, 0x35, 0x35, 0x1b
+	.byte 0x03, 0x27, 0x01, 0x0d, 0x1d, 0x1c, 0x0e, 0x11, 0x11, 0x2b, 0x10, 0x25, 0x3b, 0x20, 0x1f, 0x17, 0x19, 0x20, 0x08, 0x36, 0x13, 0x38, 0x19, 0x1b, 0x2b, 0x24, 0x0b, 0x1f, 0x29, 0x27, 0x15, 0x2c
+	.byte 0x37, 0x39, 0x10, 0x3a, 0x15, 0x2e, 0x2f, 0x11, 0x36, 0x24, 0x04, 0x20, 0x3b, 0x2a, 0x35, 0x27, 0x35, 0x34, 0x0d, 0x1b, 0x20, 0x10, 0x22, 0x37, 0x1f, 0x38, 0x27, 0x31, 0x0f, 0x28, 0x28, 0x25
+	.byte 0x15, 0x00, 0x1d, 0x25, 0x31, 0x28, 0x28, 0x0b, 0x3a, 0x1d, 0x2d, 0x13, 0x1b, 0x03, 0x37, 0x2e, 0x1d, 0x28, 0x19, 0x08, 0x2d, 0x22, 0x27, 0x39, 0x32, 0x3f, 0x2f, 0x1d, 0x33, 0x34, 0x28, 0x18
+	.byte 0x08, 0x31, 0x23, 0x1f, 0x13, 0x0d, 0x2c, 0x23, 0x3a, 0x2d, 0x1a, 0x02, 0x25, 0x13, 0x20, 0x36, 0x34, 0x12, 0x2b, 0x2d, 0x35, 0x35, 0x34, 0x23, 0x20, 0x21, 0x3a, 0x19, 0x1b, 0x1f, 0x2b, 0x19
+	.byte 0x35, 0x0e, 0x19, 0x26, 0x24, 0x37, 0x18, 0x08, 0x10, 0x0c, 0x16, 0x2d, 0x1f, 0x34, 0x21, 0x05, 0x38, 0x19, 0x14, 0x21, 0x24, 0x11, 0x31, 0x14, 0x3e, 0x38, 0x29, 0x3f, 0x08, 0x25, 0x2a, 0x1f
+	.byte 0x25, 0x25, 0x06, 0x28, 0x0b, 0x1e, 0x14, 0x1a, 0x38, 0x22, 0x24, 0x18, 0x29, 0x1a, 0x11, 0x20, 0x3b, 0x3a, 0x1e, 0x1c, 0x26, 0x1a, 0x05, 0x32, 0x19, 0x39, 0x2a, 0x31, 0x09, 0x07, 0x25, 0x05
+	.byte 0x3e, 0x16, 0x34, 0x26, 0x14, 0x1b, 0x32, 0x26, 0x05, 0x08, 0x37, 0x0f, 0x03, 0x20, 0x2a, 0x39, 0x31, 0x08, 0x01, 0x1e, 0x1d, 0x23, 0x31, 0x28, 0x1b, 0x28, 0x1e, 0x37, 0x14, 0x13, 0x0e, 0x28
+	.byte 0x2a, 0x3b, 0x37, 0x2f, 0x1c, 0x28, 0x30, 0x30, 0x1a, 0x36, 0x1f, 0x16, 0x3e, 0x0d, 0x15, 0x2e, 0x16, 0x18, 0x15, 0x37, 0x20, 0x2a, 0x33, 0x30, 0x2b, 0x0e, 0x25, 0x18, 0x20, 0x16, 0x02, 0x19
+	.byte 0x25, 0x0a, 0x2e, 0x30, 0x16, 0x03, 0x11, 0x04, 0x27, 0x25, 0x1b, 0x1c, 0x21, 0x29, 0x04, 0x27, 0x3d, 0x20, 0x1e, 0x28, 0x33, 0x31, 0x1e, 0x39, 0x10, 0x31, 0x29, 0x1e, 0x06, 0x25, 0x28, 0x19
+	.byte 0x3b, 0x12, 0x0b, 0x1b, 0x1c, 0x3e, 0x37, 0x20, 0x0a, 0x37, 0x33, 0x02, 0x2c, 0x25, 0x15, 0x18, 0x14, 0x3b, 0x20, 0x1c, 0x22, 0x3b, 0x1c, 0x24, 0x34, 0x35, 0x0f, 0x2f, 0x31, 0x3b, 0x17, 0x35
+	.byte 0x30, 0x39, 0x37, 0x0d, 0x15, 0x11, 0x10, 0x03, 0x1e, 0x1a, 0x39, 0x33, 0x2f, 0x2e, 0x28, 0x1c, 0x28, 0x36, 0x28, 0x18, 0x1f, 0x15, 0x01, 0x30, 0x3e, 0x32, 0x28, 0x34, 0x2f, 0x23, 0x07, 0x0c
+	.byte 0x36, 0x28, 0x2c, 0x34, 0x2a, 0x0c, 0x1f, 0x3f, 0x20, 0x13, 0x2b, 0x17, 0x27, 0x28, 0x29, 0x2a, 0x3c, 0x13, 0x36, 0x26, 0x2d, 0x2a, 0x0a, 0x06, 0x1e, 0x20, 0x04, 0x1a, 0x02, 0x07, 0x35, 0x0e
+	.byte 0x18, 0x30, 0x00, 0x34, 0x34, 0x2f, 0x14, 0x37, 0x21, 0x30, 0x1f, 0x15, 0x37, 0x1b, 0x3a, 0x0b, 0x32, 0x22, 0x22, 0x21, 0x1b, 0x35, 0x23, 0x0d, 0x03, 0x1c, 0x23, 0x3b, 0x13, 0x0e, 0x1d, 0x1f
+	.byte 0x1d, 0x3f, 0x2e, 0x39, 0x27, 0x2e, 0x0f, 0x38, 0x20, 0x31, 0x3c, 0x35, 0x0b, 0x0f, 0x2e, 0x06, 0x06, 0x28, 0x25, 0x39, 0x23, 0x0a, 0x32, 0x15, 0x0f, 0x1d, 0x25, 0x0c, 0x0d, 0x34, 0x12, 0x2e
+	.byte 0x21, 0x36, 0x18, 0x1f, 0x1f, 0x34, 0x1b, 0x05, 0x3a, 0x36, 0x2b, 0x01, 0x17, 0x0e, 0x16, 0x2b, 0x0e, 0x0b, 0x26, 0x0d, 0x2d, 0x10, 0x21, 0x11, 0x27, 0x3d, 0x13, 0x32, 0x15, 0x25, 0x2a, 0x1b
+	.byte 0x2d, 0x35, 0x2c, 0x2b, 0x26, 0x26, 0x1f, 0x20, 0x22, 0x2b, 0x12, 0x3f, 0x3d, 0x27, 0x30, 0x0a, 0x36, 0x35, 0x1f, 0x17, 0x21, 0x08, 0x29, 0x1d, 0x20, 0x33, 0x34, 0x11, 0x16, 0x05, 0x38, 0x2d
+

data/data2b.s

@@ -4750,74 +4750,74 @@ gUnknown_0831ABA0:: @ 831ABA0
 	.align 2
 gBattleTerrainTable:: @ 831ABA8
 	@ tall_grass
-	.4byte gUnknown_08D77D68
+	.4byte gBattleTerrainTiles_TallGrass
-	.4byte gUnknown_08D78350
+	.4byte gBattleTerrainTilemap_TallGrass
-	.4byte gUnknown_08D7E280
+	.4byte gBattleTerrainAnimTiles_TallGrass
-	.4byte gUnknown_08D7E808
+	.4byte gBattleTerrainAnimTilemap_TallGrass
-	.4byte gUnknown_08D78318
+	.4byte gBattleTerrainPalette_TallGrass
 
 	@ long_grass
-	.4byte gUnknown_08D78600
+	.4byte gBattleTerrainTiles_LongGrass
-	.4byte gUnknown_08D78CB8
+	.4byte gBattleTerrainTilemap_LongGrass
-	.4byte gUnknown_08D7E9C4
+	.4byte gBattleTerrainAnimTiles_LongGrass
-	.4byte gUnknown_08D7F0D4
+	.4byte gBattleTerrainAnimTilemap_LongGrass
-	.4byte gUnknown_08D78C78
+	.4byte gBattleTerrainPalette_LongGrass
 
 	@ sand
-	.4byte gUnknown_08D78F68
+	.4byte gBattleTerrainTiles_Sand
-	.4byte gUnknown_08D795A8
+	.4byte gBattleTerrainTilemap_Sand
-	.4byte gUnknown_08D7F30C
+	.4byte gBattleTerrainAnimTiles_Sand
-	.4byte gUnknown_08D7F850
+	.4byte gBattleTerrainAnimTilemap_Sand
-	.4byte gUnknown_08D79560
+	.4byte gBattleTerrainPalette_Sand
 
 	@ underwater
-	.4byte gUnknown_08D79858
+	.4byte gBattleTerrainTiles_Underwater
-	.4byte gUnknown_08D79E58
+	.4byte gBattleTerrainTilemap_Underwater
-	.4byte gUnknown_08D7F9F8
+	.4byte gBattleTerrainAnimTiles_Underwater
-	.4byte gUnknown_08D7FEC4
+	.4byte gBattleTerrainAnimTilemap_Underwater
-	.4byte gUnknown_08D79E10
+	.4byte gBattleTerrainPalette_Underwater
 
 	@ water
-	.4byte gUnknown_08D7A108
+	.4byte gBattleTerrainTiles_Water
-	.4byte gUnknown_08D7A720
+	.4byte gBattleTerrainTilemap_Water
-	.4byte gUnknown_08D80054
+	.4byte gBattleTerrainAnimTiles_Water
-	.4byte gUnknown_08D80660
+	.4byte gBattleTerrainAnimTilemap_Water
-	.4byte gUnknown_08D7A6DC
+	.4byte gBattleTerrainPalette_Water
 
 	@ pond_water
-	.4byte gUnknown_08D7A9D0
+	.4byte gBattleTerrainTiles_PondWater
-	.4byte gUnknown_08D7AFB8
+	.4byte gBattleTerrainTilemap_PondWater
-	.4byte gUnknown_08D80804
+	.4byte gBattleTerrainAnimTiles_PondWater
-	.4byte gUnknown_08D80D50
+	.4byte gBattleTerrainAnimTilemap_PondWater
-	.4byte gUnknown_08D7AF78
+	.4byte gBattleTerrainPalette_PondWater
 
 	@ rock
-	.4byte gUnknown_08D7B268
+	.4byte gBattleTerrainTiles_Rock
-	.4byte gUnknown_08D7B864
+	.4byte gBattleTerrainTilemap_Rock
-	.4byte gUnknown_08D80E9C
+	.4byte gBattleTerrainAnimTiles_Rock
-	.4byte gUnknown_08D8147C
+	.4byte gBattleTerrainAnimTilemap_Rock
-	.4byte gUnknown_08D7B828
+	.4byte gBattleTerrainPalette_Rock
 
 	@ cave
-	.4byte gUnknown_08D7BB14
+	.4byte gBattleTerrainTiles_Cave
-	.4byte gUnknown_08D7C154
+	.4byte gBattleTerrainTilemap_Cave
-	.4byte gUnknown_08D81610
+	.4byte gBattleTerrainAnimTiles_Cave
-	.4byte gUnknown_08D81E2C
+	.4byte gBattleTerrainAnimTilemap_Cave
-	.4byte gUnknown_08D7C10C
+	.4byte gBattleTerrainPalette_Cave
 
 	@ building
-	.4byte gUnknown_08D7C440
+	.4byte gBattleTerrainTiles_Building
-	.4byte gUnknown_08D7CA28
+	.4byte gBattleTerrainTilemap_Building
-	.4byte gUnknown_08D820D4
+	.4byte gBattleTerrainAnimTiles_Building
-	.4byte gUnknown_08D824E4
+	.4byte gBattleTerrainAnimTilemap_Building
-	.4byte gUnknown_08D7DEB4
+	.4byte gBattleTerrainPalette_Building
 
 	@ plain
-	.4byte gUnknown_08D7C440
+	.4byte gBattleTerrainTiles_Building
-	.4byte gUnknown_08D7CA28
+	.4byte gBattleTerrainTilemap_Building
-	.4byte gUnknown_08D820D4
+	.4byte gBattleTerrainAnimTiles_Building
-	.4byte gUnknown_08D824E4
+	.4byte gBattleTerrainAnimTilemap_Building
-	.4byte gUnknown_08D7C404
+	.4byte gBattleTerrainPalette_Plain
 
 	.align 2
 gUnknown_0831AC70:: @ 831AC70

data/data4d.s

@@ -5,93 +5,6 @@
 
 	.section .rodata
 
-gUnknown_085B21D4:: @ 85B21D4
-	.incbin "baserom.gba", 0x5b21d4, 0x8
-
-gUnknown_085B21DC:: @ 85B21DC
-	.incbin "baserom.gba", 0x5b21dc, 0x18
-
-gUnknown_085B21F4:: @ 85B21F4
-	.incbin "baserom.gba", 0x5b21f4, 0x8
-
-gUnknown_085B21FC:: @ 85B21FC
-	.incbin "baserom.gba", 0x5b21fc, 0xc
-
-gUnknown_085B2208:: @ 85B2208
-	.incbin "baserom.gba", 0x5b2208, 0x10
-
-gUnknown_085B2218:: @ 85B2218
-	.incbin "baserom.gba", 0x5b2218, 0x38
-
-gUnknown_085B2250:: @ 85B2250
-	.incbin "baserom.gba", 0x5b2250, 0x18
-
-gUnknown_085B2268:: @ 85B2268
-	.incbin "baserom.gba", 0x5b2268, 0x38
-
-gUnknown_085B22A0:: @ 85B22A0
-	.incbin "baserom.gba", 0x5b22a0, 0x18
-
-gUnknown_085B22B8:: @ 85B22B8
-	.incbin "baserom.gba", 0x5b22b8, 0x18
-
-gUnknown_085B22D0:: @ 85B22D0
-	.incbin "baserom.gba", 0x5b22d0, 0x2d0
-
-gPokeblockFlavorCompatibilityTable:: @ 85B25A0
-	.incbin "baserom.gba", 0x5b25a0, 0x80
-
-gUnknown_085B2620:: @ 85B2620
-	.incbin "baserom.gba", 0x5b2620, 0xc
-
-gPokeblockNames:: @ 85B262C
-	.incbin "baserom.gba", 0x5b262c, 0x3c
-
-gUnknown_085B2668:: @ 85B2668
-	.incbin "baserom.gba", 0x5b2668, 0x30
-
-gUnknown_085B2698:: @ 85B2698
-	.incbin "baserom.gba", 0x5b2698, 0x3
-
-gUnknown_085B269B:: @ 85B269B
-	.incbin "baserom.gba", 0x5b269b, 0x2
-
-gUnknown_085B269D:: @ 85B269D
-	.incbin "baserom.gba", 0x5b269d, 0x2
-
-gUnknown_085B269F:: @ 85B269F
-	.incbin "baserom.gba", 0x5b269f, 0x5
-
-gUnknown_085B26A4:: @ 85B26A4
-	.incbin "baserom.gba", 0x5b26a4, 0x4c
-
-gUnknown_085B26F0:: @ 85B26F0
-	.incbin "baserom.gba", 0x5b26f0, 0x4
-
-gUnknown_085B26F4:: @ 85B26F4
-	.incbin "baserom.gba", 0x5b26f4, 0x8
-
-gUnknown_085B26FC:: @ 85B26FC
-	.incbin "baserom.gba", 0x5b26fc, 0x8
-
-gUnknown_085B2704:: @ 85B2704
-	.incbin "baserom.gba", 0x5b2704, 0x18
-
-gUnknown_085B271C:: @ 85B271C
-	.incbin "baserom.gba", 0x5b271c, 0x4
-
-gUnknown_085B2720:: @ 85B2720
-	.incbin "baserom.gba", 0x5b2720, 0x28
-
-gUnknown_085B2748:: @ 85B2748
-	.incbin "baserom.gba", 0x5b2748, 0x60
-
-gUnknown_085B27A8:: @ 85B27A8
-	.incbin "baserom.gba", 0x5b27a8, 0x8
-
-gUnknown_085B27B0:: @ 85B27B0
-	.incbin "baserom.gba", 0x5b27b0, 0x18
-
 gUnknown_085B27C8:: @ 85B27C8
 	.incbin "baserom.gba", 0x5b27c8, 0x88
 
@@ -830,4 +743,3 @@ gUnknown_085C9A30:: @ 85C9A30
 
 gUnknown_085C9A53:: @ 85C9A53
 	.incbin "baserom.gba", 0x5c9a53, 0x41
-

data/easy_chat.s

@@ -14,13 +14,42 @@ gUnknown_08597550:: @ 8597550
 	.incbin "baserom.gba", 0x597550, 0x1f8
 
 gUnknown_08597748:: @ 8597748
-	.incbin "baserom.gba", 0x597748, 0x1c
+	.byte 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x00, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x00, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18, 0x19, 0x1a
 
 gUnknown_08597764:: @ 8597764
-	.incbin "baserom.gba", 0x597764, 0x8
+	.2byte 0x0209, 0x140b, 0x1030, 0x102a
 
 gUnknown_0859776C:: @ 859776C
-	.incbin "baserom.gba", 0x59776c, 0x3a8
+	.2byte 0x1240, 0x0628, 0x061f, 0x2204, 0x1422, 0x0197, 0x0415, 0x0198, 0x2207, 0x0449, 0x4bff, 0x4b1f, 0x2e3d, 0x1577, 0x6b5f, 0x5ade
+	.2byte 0x4218, 0x0000, 0x0000, 0x0000, 0x0000, 0x18c5, 0x318c, 0x5af6, 0x6f5b, 0x7fff, 0xccc0, 0x0000, 0xddc0, 0x000c, 0xddc0, 0x00cd
+	.2byte 0xddc0, 0x0cdd, 0xddc0, 0x0cdd, 0xddc0, 0x00cd, 0xddc0, 0x000c, 0xccc0, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
+	.2byte 0x0000, 0x0000, 0x0000, 0xc000, 0x0000, 0x6c00, 0x0000, 0x66c0, 0x0000, 0x666c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
+	.2byte 0x0000, 0x0000, 0x000c, 0x0000, 0x00c6, 0x0000, 0x0c66, 0x0000, 0xc666, 0x0000, 0xc000, 0x6666, 0xc000, 0x6666, 0xc000, 0x6666
+	.2byte 0xc000, 0xcccc, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x6666, 0x000c, 0x6666, 0x000c, 0x6666, 0x000c
+	.2byte 0xcccc, 0x000c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
+	.2byte 0x0000, 0x0000, 0x0000, 0xc000, 0x0000, 0x6c00, 0x0000, 0x66c0, 0x0000, 0x666c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000
+	.2byte 0x0000, 0x0000, 0x000c, 0x0000, 0x00c6, 0x0000, 0x0c66, 0x0000, 0xc666, 0x0000, 0xc000, 0x6666, 0xc000, 0x6666, 0xc000, 0x6666
+	.2byte 0xc000, 0xcccc, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x6666, 0x000c, 0x6666, 0x000c, 0x6666, 0x000c
+	.2byte 0xcccc, 0x000c, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x99c0, 0x9999, 0xf99c, 0xff9f, 0xf99c, 0xf999
+	.2byte 0xf99c, 0xf99f, 0x999c, 0xf99f, 0xf99c, 0xf99f, 0x99c0, 0x9999, 0xcc00, 0xcccc, 0x9999, 0x9999, 0xff9f, 0xff9f, 0x9f99, 0x9f9f
+	.2byte 0xff99, 0xff9f, 0x9f99, 0x9f9f, 0x9f99, 0x9f9f, 0x9999, 0x9999, 0xcccc, 0xcccc, 0x9999, 0x9999, 0xff9f, 0x999f, 0xf99f, 0x9999
+	.2byte 0xf999, 0x9999, 0xf99f, 0xf999, 0xf99f, 0x9999, 0x9999, 0x9999, 0xcccc, 0xcccc, 0x9999, 0x0c99, 0x9999, 0xc999, 0x9ff9, 0xc999
+	.2byte 0xffff, 0xc999, 0xffff, 0xc99f, 0x9999, 0xc999, 0x9999, 0xcc99, 0xcccc, 0x0ccc, 0x99c0, 0x9999, 0xf99c, 0xff9f, 0xf99c, 0x9f99
+	.2byte 0xf99c, 0xff9f, 0x999c, 0x9f9f, 0xf99c, 0xff9f, 0x99c0, 0x9999, 0xcc00, 0xcccc, 0x9999, 0x9999, 0x99f9, 0xf9ff, 0x99f9, 0xf99f
+	.2byte 0x99f9, 0xf9ff, 0x99f9, 0xf99f, 0x9ff9, 0xf9ff, 0x9999, 0x9999, 0xcccc, 0xcccc, 0x9999, 0x9999, 0xff9f, 0x999f, 0xf999, 0xf999
+	.2byte 0xf999, 0x9999, 0xf999, 0x9999, 0xf99f, 0x9999, 0x9999, 0x9999, 0xcccc, 0xcccc, 0x9999, 0x0c99, 0x9999, 0xc999, 0xffff, 0xc99f
+	.2byte 0xffff, 0xc999, 0x9ff9, 0xc999, 0x9999, 0xc999, 0x9999, 0xcc99, 0xcccc, 0x0ccc, 0x0000, 0x5fff, 0x67bd, 0x4b1a, 0x6fff, 0x0000
+	.2byte 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0010, 0x0008, 0x003f, 0xf000, 0xf001, 0xf001
+	.2byte 0xf001, 0xf001, 0xf001, 0xff01, 0x01f0, 0x01f0, 0x01f0, 0x01f0, 0x01f0, 0x01f0, 0x01f0, 0x01f0, 0xf0d5, 0x0001, 0x1001, 0x0300
+	.2byte 0x0024, 0x1106, 0x0600, 0x2240, 0x1cd0, 0x1111, 0x1111, 0x2222, 0x223f, 0x5022, 0xf007, 0xf01f, 0xf01f, 0xf01f, 0xf01f, 0xfb1f
+	.2byte 0x1ff0, 0x1ff0, 0x1ff0, 0x1ff0, 0x01b0, 0x0001, 0x1003, 0x4f14, 0x0011, 0x2208, 0x3032, 0x3031, 0xf0e7, 0x1007, 0xff07, 0x4fd0
+	.2byte 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0xf0ff, 0xf007, 0xd007, 0x3007, 0xf0e7, 0xf007, 0xf0ff, 0xf007, 0xffff
+	.2byte 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0xf0ff, 0xf007, 0xf0ff, 0xf0f7, 0xf0ff, 0xf007, 0xf0ff, 0xf007
+	.2byte 0xff07, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0xf0ff, 0xf0f7, 0xf0ff, 0xf0f7, 0xf0ff, 0xf007, 0xf007
+	.2byte 0xf007, 0xff07, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0x07f0, 0xff60, 0xcd40, 0xf0db, 0x50ff, 0x40ff, 0x1224, 0x0300, 0xf430
+	.2byte 0x704f, 0x0f4f, 0x3333, 0x3333, 0x1ff0, 0x1ff0, 0x1ff0, 0x1ff0, 0xf0fe, 0xf01f, 0xf01f, 0xf01f, 0xf01f, 0xd01f, 0x001f, 0x03e7
+	.2byte 0x30ff, 0x00dc, 0xf006, 0xf001, 0xf001, 0xf001, 0xf001, 0xf001, 0xff01, 0x01f0, 0x01f0, 0x01f0, 0x01f0, 0x01f0, 0x01f0, 0x01f0
+	.2byte 0x01f0, 0xf0c0, 0x0001, 0x0001
 
 gUnknown_08597B14:: @ 8597B14
 	.incbin "baserom.gba", 0x597b14, 0x20
@@ -38,7 +67,8 @@ gUnknown_08597C24:: @ 8597C24
 	.incbin "baserom.gba", 0x597c24, 0xc
 
 gUnknown_08597C30:: @ 8597C30
-	.incbin "baserom.gba", 0x597c30, 0x24
+	.byte 0x83, 0x18, 0x04, 0x00, 0x63, 0x18, 0x06, 0x00, 0x03, 0x18, 0x0a, 0x00, 0xa3, 0x18, 0x02, 0x00, 0xb0, 0x0c, 0x02, 0x00, 0x83, 0x18, 0x04, 0x00, 0x89, 0x0c, 0x02, 0x01, 0x65, 0x14, 0x0a, 0x03
+	.byte 0x03, 0x18, 0x0a, 0x02
 
 gUnknown_08597C54:: @ 8597C54
 	.incbin "baserom.gba", 0x597c54, 0x10
@@ -53,7 +83,10 @@ gUnknown_08597C8C:: @ 8597C8C
 	.incbin "baserom.gba", 0x597c8c, 0x4
 
 gUnknown_08597C90:: @ 8597C90
-	.incbin "baserom.gba", 0x597c90, 0x10
+	.4byte gUnknown_862B810
+	.4byte gUnknown_862B832
+	.4byte gUnknown_862B84B
+	.4byte gUnknown_862B86C
 
 gUnknown_08597CA0:: @ 8597CA0
 	.incbin "baserom.gba", 0x597ca0, 0x20
@@ -65,7 +98,7 @@ gUnknown_08597CE8:: @ 8597CE8
 	.incbin "baserom.gba", 0x597ce8, 0x20
 
 gUnknown_08597D08:: @ 8597D08
-	.incbin "baserom.gba", 0x597d08, 0x10
+	.byte 0x00, 0x0c, 0x18, 0x38, 0x44, 0x50, 0x5c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00
 
 gUnknown_08597D18:: @ 8597D18
 	.incbin "baserom.gba", 0x597d18, 0x50
@@ -86,7 +119,7 @@ gUnknown_08597E48:: @ 8597E48
 	.incbin "baserom.gba", 0x597e48, 0x18
 
 gUnknown_08597E60:: @ 8597E60
-	.incbin "baserom.gba", 0x597e60, 0xc
+	.byte 0x10, 0x6f, 0xc4, 0x00, 0x10, 0x4e, 0x82, 0xa0, 0x10, 0x50, 0x86, 0xaa
 
 gUnknown_08597E6C:: @ 8597E6C
 	.incbin "baserom.gba", 0x597e6c, 0x30
@@ -101,16 +134,16 @@ gUnknown_08597E6C:: @ 8597E6C
 	.include "data/text/easy_chat/easy_chat_group_name_pointers.inc"
 
 gUnknown_0859E62C:: @ 859E62C
-	.incbin "baserom.gba", 0x59e62c, 0x8
+	.2byte 0x0a29, 0x1020, 0x020e, 0x0a33
 
 gUnknown_0859E634:: @ 859E634
-	.incbin "baserom.gba", 0x59e634, 0xc
+	.2byte 0x100f, 0x0a02, 0x0e25, 0x0c03, 0x0803, 0x0c00
 
 gUnknown_0859E640:: @ 859E640
-	.incbin "baserom.gba", 0x59e640, 0xc
+	.2byte 0x0c3a, 0x0c3a, 0x0c01, 0x0a2a, 0x0607, 0x0c01
 
 gUnknown_0859E64C:: @ 859E64C
-	.incbin "baserom.gba", 0x59e64c, 0xc
+	.2byte 0x1039, 0x122e, 0x0c04, 0x0a3d, 0x0630, 0x0c04
 
 gUnknown_0859E658:: @ 859E658
-	.incbin "baserom.gba", 0x59e658, 0x4
+	.2byte 0x019a, 0x0000

data/field_effect_helpers.s

@@ -7,19 +7,23 @@ gUnknown_085CDC38:: @ 85CDC38
 	.incbin "baserom.gba", 0x5cdc38, 0x6
 
 gUnknown_085CDC3E:: @ 85CDC3E
-	.incbin "baserom.gba", 0x5cdc3e, 0x4
+	.byte 0x00, 0x01, 0x02, 0x03
 
 gUnknown_085CDC42:: @ 85CDC42
-	.incbin "baserom.gba", 0x5cdc42, 0xa
+	.2byte 0x0004, 0x0004, 0x0004, 0x0010, 0x0000
 
 gUnknown_085CDC4C:: @ 85CDC4C
-	.incbin "baserom.gba", 0x5cdc4c, 0x8
+	.4byte sub_8154C7C
+	.4byte sub_8154CA0
 
 gUnknown_085CDC54:: @ 85CDC54
-	.incbin "baserom.gba", 0x5cdc54, 0xc
+	.4byte sub_815547C
+	.4byte sub_81554AC
+	.4byte sub_815550C
 
 gUnknown_085CDC60:: @ 85CDC60
 	.incbin "baserom.gba", 0x5cdc60, 0xa
 
 gUnknown_085CDC6A:: @ 85CDC6A
 	.incbin "baserom.gba", 0x5cdc6a, 0x96
+

data/field_effect_scripts.s

@@ -74,7 +74,7 @@ gFieldEffectScriptPointers:: @ 82DB9D4
 	.4byte gFieldEffectScript_Unknown66
 
 gFieldEffectScript_ExclamationMarkIcon1:: @ 82DBAE0
-	field_eff_callnative oei_exclamation_mark
+	field_eff_callnative FldEff_ExclamationMarkIcon1
 	field_eff_end
 
 gFieldEffectScript_UseCutOnTallGrass:: @ 82DBAE6
@@ -207,7 +207,7 @@ gFieldEffectScript_FlyIn:: @ 82DBBE9
 	field_eff_end
 
 gFieldEffectScript_ExclamationMarkIcon2:: @ 82DBBEF
-	field_eff_callnative sub_80B4658
+	field_eff_callnative FldEff_ExclamationMarkIcon2
 	field_eff_end
 
 gFieldEffectScript_FeetInFlowingWater:: @ 82DBBF5
@@ -260,7 +260,7 @@ gFieldEffectScript_Unknown45:: @ 82DBC4B
 	field_eff_end
 
 gFieldEffectScript_HeartIcon:: @ 82DBC56
-	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, sub_80B4690
+	field_eff_loadfadedpal_callnative gFieldEffectObjectPaletteInfo0, FldEff_HeartIcon
 	field_eff_end
 
 gFieldEffectScript_Unknown47:: @ 82DBC60

data/field_ground_effect.s

@@ -5,34 +5,100 @@
     .align 2, 0
 
 gUnknown_0850E5DC:: @ 850E5DC
-	.incbin "baserom.gba", 0x50e5dc, 0x8
+	.4byte 0x00000020, 0x00000010
 
 gUnknown_0850E5E4:: @ 850E5E4
-	.incbin "baserom.gba", 0x50e5e4, 0x18
+	.4byte MetatileBehavior_IsTallGrass
+	.4byte MetatileBehavior_IsLongGrass
+	.4byte MetatileBehavior_IsPuddle
+	.4byte MetatileBehavior_IsSurfableWaterOrUnderwater
+	.4byte MetatileBehavior_IsShallowFlowingWater
+	.4byte ShouldDoJumpLandingDustEffect
 
 gUnknown_0850E5FC:: @ 850E5FC
-	.incbin "baserom.gba", 0x50e5fc, 0x18
+	.4byte 0x00001000, 0x00002000, 0x00004000, 0x00008000, 0x00004000, 0x00010000
 
 gUnknown_0850E614:: @ 850E614
-	.incbin "baserom.gba", 0x50e614, 0x10
+	.4byte MetatileBehavior_IsJumpSouth
+	.4byte MetatileBehavior_IsJumpNorth
+	.4byte MetatileBehavior_IsJumpWest
+	.4byte MetatileBehavior_IsJumpEast
 
 gUnknown_0850E624:: @ 850E624
-	.incbin "baserom.gba", 0x50e624, 0x10
+	.byte 0x73, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x73, 0x53, 0x00, 0x00, 0x73
 
 gUnknown_0850E634:: @ 850E634
-	.incbin "baserom.gba", 0x50e634, 0x10
+	.byte 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x00, 0x00, 0x02
 
 gUnknown_0850E644:: @ 850E644
-	.incbin "baserom.gba", 0x50e644, 0x10
+	.byte 0x01, 0x01, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x00, 0x00, 0x01
 
 gUnknown_0850E654:: @ 850E654
-	.incbin "baserom.gba", 0x50e654, 0xc
+	.4byte DoTracksGroundEffect_None
+	.4byte DoTracksGroundEffect_Footprints
+	.4byte DoTracksGroundEffect_BikeTireTracks
 
 gUnknown_0850E660:: @ 850E660
 	.incbin "baserom.gba", 0x50e660, 0x4
 
 gUnknown_0850E664:: @ 850E664
-	.incbin "baserom.gba", 0x50e664, 0x10
+	.byte 0x01, 0x02, 0x07, 0x08, 0x01, 0x02, 0x06, 0x05, 0x05, 0x08, 0x03, 0x04, 0x06, 0x07, 0x03, 0x04
 
 gUnknown_0850E674:: @ 850E674
-	.incbin "baserom.gba", 0x50e674, 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
+	.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
+	.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
+	.4byte double_little_steps
+	.4byte triple_little_steps
+	.4byte triple_little_steps
+	.4byte double_little_steps
+	.4byte triple_little_steps
+	.4byte triple_little_steps
+	.4byte quad_little_steps
+	.4byte quad_little_steps
+	.4byte quad_little_steps
+	.4byte quad_little_steps
+	.4byte oct_little_steps
+	.4byte oct_little_steps
+

data/field_player_avatar.s

@@ -8,52 +8,111 @@
 
 
 gUnknown_084973FC:: @ 84973FC
-	.incbin "baserom.gba", 0x4973fc, 0x48
+	.4byte MetatileBehavior_IsTrickHouseSlipperyFloor
+	.4byte MetatileBehavior_IsIce_2
+	.4byte MetatileBehavior_IsWalkSouth
+	.4byte MetatileBehavior_IsWalkNorth
+	.4byte MetatileBehavior_IsWalkWest
+	.4byte MetatileBehavior_IsWalkEast
+	.4byte MetatileBehavior_IsSouthwardCurrent
+	.4byte MetatileBehavior_IsNorthwardCurrent
+	.4byte MetatileBehavior_IsWestwardCurrent
+	.4byte MetatileBehavior_IsEastwardCurrent
+	.4byte MetatileBehavior_IsSlideSouth
+	.4byte MetatileBehavior_IsSlideNorth
+	.4byte MetatileBehavior_IsSlideWest
+	.4byte MetatileBehavior_IsSlideEast
+	.4byte MetatileBehavior_IsWaterfall
+	.4byte MetatileBehavior_IsSecretBaseJumpMat
+	.4byte MetatileBehavior_IsSecretBaseSpinMat
+	.4byte MetatileBehavior_IsMuddySlope
 
 gUnknown_08497444:: @ 8497444
-	.incbin "baserom.gba", 0x497444, 0x4c
+	.4byte ForcedMovement_None
+	.4byte ForcedMovement_Slip
+	.4byte ForcedMovement_Slip
+	.4byte ForcedMovement_WalkSouth
+	.4byte ForcedMovement_WalkNorth
+	.4byte ForcedMovement_WalkWest
+	.4byte ForcedMovement_WalkEast
+	.4byte ForcedMovement_PushedSouthByCurrent
+	.4byte ForcedMovement_PushedNorthByCurrent
+	.4byte ForcedMovement_PushedWestByCurrent
+	.4byte ForcedMovement_PushedEastByCurrent
+	.4byte ForcedMovement_SlideSouth
+	.4byte ForcedMovement_SlideNorth
+	.4byte ForcedMovement_SlideWest
+	.4byte ForcedMovement_SlideEast
+	.4byte ForcedMovement_PushedSouthByCurrent
+	.4byte ForcedMovement_0xBB
+	.4byte ForcedMovement_0xBC
+	.4byte ForcedMovement_MuddySlope
 
 gUnknown_08497490:: @ 8497490
-	.incbin "baserom.gba", 0x497490, 0xc
+	.4byte PlayerNotOnBikeNotMoving
+	.4byte PlayerNotOnBikeTurningInPlace
+	.4byte PlayerNotOnBikeMoving
 
 gUnknown_0849749C:: @ 849749C
-	.incbin "baserom.gba", 0x49749c, 0x14
+	.4byte MetatileBehavior_IsBumpySlope
+	.4byte MetatileBehavior_IsIsolatedVerticalRail
+	.4byte MetatileBehavior_IsIsolatedHorizontalRail
+	.4byte MetatileBehavior_IsVerticalRail
+	.4byte MetatileBehavior_IsHorizontalRail
 
 gUnknown_084974B0:: @ 84974B0
-	.incbin "baserom.gba", 0x4974b0, 0x8
+	.byte 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x00, 0x00, 0x00
 
 gUnknown_084974B8:: @ 84974B8
-	.incbin "baserom.gba", 0x4974b8, 0x20
+	.4byte PlayerAvatarTransition_Normal
+	.4byte PlayerAvatarTransition_MachBike
+	.4byte PlayerAvatarTransition_AcroBike
+	.4byte PlayerAvatarTransition_Surfing
+	.4byte PlayerAvatarTransition_Underwater
+	.4byte PlayerAvatarTransition_ReturnToField
+	.4byte PlayerAvatarTransition_Dummy
+	.4byte PlayerAvatarTransition_Dummy
 
 gUnknown_084974D8:: @ 84974D8
-	.incbin "baserom.gba", 0x4974d8, 0x10
+	.4byte MetatileBehavior_IsSouthArrowWarp
+	.4byte MetatileBehavior_IsNorthArrowWarp
+	.4byte MetatileBehavior_IsWestArrowWarp
+	.4byte MetatileBehavior_IsEastArrowWarp
 
 gUnknown_084974E8:: @ 84974E8
-	.incbin "baserom.gba", 0x4974e8, 0x10
+	.byte 0x64, 0x69, 0x65, 0x6a, 0x66, 0x6b, 0x67, 0x6c, 0x6f, 0x70, 0x68, 0x6d, 0x89, 0x8a, 0xbf, 0xc0
 
 gUnknown_084974F8:: @ 84974F8
-	.incbin "baserom.gba", 0x4974f8, 0x10
+	.byte 0x00, 0x59, 0x01, 0x5a, 0x3f, 0x5b, 0x02, 0x5c, 0x6f, 0x70, 0x03, 0x5d, 0x89, 0x8a, 0xbf, 0xc0
 
 gUnknown_08497508:: @ 8497508
-	.incbin "baserom.gba", 0x497508, 0x2
+	.byte 0xe6, 0xe7
 
 gUnknown_0849750A:: @ 849750A
-	.incbin "baserom.gba", 0x49750a, 0x2
+	.byte 0xeb, 0xec
 
 gUnknown_0849750C:: @ 849750C
-	.incbin "baserom.gba", 0x49750c, 0x14
+	.byte 0x00, 0x01, 0x01, 0x02, 0x3f, 0x04, 0x02, 0x08, 0x6f, 0x10, 0x59, 0x01, 0x5a, 0x02, 0x5b, 0x04, 0x5c, 0x08, 0x70, 0x10
 
 gUnknown_08497520:: @ 8497520
-	.incbin "baserom.gba", 0x497520, 0x10
+	.4byte MetatileBehavior_IsSouthArrowWarp
+	.4byte MetatileBehavior_IsNorthArrowWarp
+	.4byte MetatileBehavior_IsWestArrowWarp
+	.4byte MetatileBehavior_IsEastArrowWarp
 
 gUnknown_08497530:: @ 8497530
-	.incbin "baserom.gba", 0x497530, 0xc
+	.4byte sub_808C3A4
+	.4byte do_boulder_dust
+	.4byte sub_808C484
 
 gUnknown_0849753C:: @ 849753C
-	.incbin "baserom.gba", 0x49753c, 0x4
+	.4byte sub_808C544
 
 gUnknown_08497540:: @ 8497540
-	.incbin "baserom.gba", 0x497540, 0x10
+	.4byte sub_808C61C
+	.4byte sub_808C644
+	.4byte sub_808C6BC
+	.4byte sub_808C6FC
 
 gUnknown_08497550:: @ 8497550
 	.incbin "baserom.gba", 0x497550, 0x4
@@ -62,7 +121,22 @@ gUnknown_08497554:: @ 8497554
 	.incbin "baserom.gba", 0x497554, 0x8
 
 gUnknown_0849755C:: @ 849755C
-	.incbin "baserom.gba", 0x49755c, 0x40
+	.4byte fish0
+	.4byte fish1
+	.4byte fish2
+	.4byte fish3
+	.4byte fish4
+	.4byte fish5
+	.4byte fish6
+	.4byte fish7
+	.4byte fish8
+	.4byte fish9
+	.4byte fishA_wait_for_a_pressed
+	.4byte fishB
+	.4byte fishC
+	.4byte fishD
+	.4byte fishE
+	.4byte fishF
 
 gUnknown_0849759C:: @ 849759C
 	.incbin "baserom.gba", 0x49759c, 0x6
@@ -80,4 +154,5 @@ gUnknown_084975B0:: @ 84975B0
 	.incbin "baserom.gba", 0x4975b0, 0xc
 
 gUnknown_084975BC:: @ 84975BC
-	.incbin "baserom.gba", 0x4975bc, 0x8
+	.byte 0x01, 0x03, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00
+

data/fieldmap.s

@@ -5,4 +5,4 @@
     .align 2, 0
 
 gUnknown_08486EF8:: @ 8486EF8
-	.incbin "baserom.gba", 0x486ef8, 0x4
+	.4byte 0x00000000

data/fldeff_cut.s

@@ -8,7 +8,9 @@ gUnknown_0857C608:: @ 857C608
 	.incbin "baserom.gba", 0x57c608, 0x2
 
 gUnknown_0857C60A:: @ 857C60A
-	.incbin "baserom.gba", 0x57c60a, 0x5a
+	.byte 0x01, 0x00, 0xff, 0xfe, 0x01, 0x00, 0x00, 0xfe, 0x02, 0x00, 0x01, 0xfe, 0x03, 0x00, 0x02, 0xfe, 0x03, 0x00, 0xfe, 0xff, 0x01, 0x00, 0x02, 0xff, 0x03, 0x00, 0xfe, 0x00, 0x04, 0x00, 0x02, 0x00
+	.byte 0x06, 0x00, 0xfe, 0x01, 0x07, 0x00, 0x02, 0x01, 0x09, 0x00, 0xfe, 0x02, 0x07, 0x00, 0xff, 0x02, 0x07, 0x00, 0x00, 0x02, 0x08, 0x00, 0x01, 0x02, 0x09, 0x00, 0x02, 0x02, 0x09, 0x00, 0x00, 0x00
+	.byte 0x00, 0x00, 0x01, 0x14, 0x00, 0x00, 0x00, 0x00, 0x1e, 0x00, 0xfe, 0xff, 0x00, 0x00, 0x50, 0xc6, 0x57, 0x08, 0x58, 0x6e, 0x4f, 0x08, 0x20, 0x00, 0x00, 0x00
 
 	.align 2
 gFieldEffectObjectPaletteInfo6:: @ 857C664

data/graphics.s

@@ -1,12 +1,12 @@
 	.section gfx_data, "aw", %progbits
 
-gUnknown_08C00000:: @ 8C00000
+gBattleTextboxTiles:: @ 8C00000
 	.incbin "baserom.gba", 0xc00000, 0x4e0
 
-gUnknown_08C004E0:: @ 8C004E0
+gBattleTextboxPalette:: @ 8C004E0
 	.incbin "baserom.gba", 0xc004e0, 0x44
 
-gUnknown_08C00524:: @ 8C00524
+gBattleTextboxTilemap:: @ 8C00524
 	.incbin "baserom.gba", 0xc00524, 0x22c
 
 @ 8C00750
@@ -352,199 +352,199 @@ gUnknown_08D77AE4:: @ 8D77AE4
 gUnknown_08D77B0C:: @ 8D77B0C
 	.incbin "baserom.gba", 0xd77b0c, 0x25c
 
-gUnknown_08D77D68:: @ 8D77D68
+gBattleTerrainTiles_TallGrass:: @ 8D77D68
 	.incbin "baserom.gba", 0xd77d68, 0x5b0
 
-gUnknown_08D78318:: @ 8D78318
+gBattleTerrainPalette_TallGrass:: @ 8D78318
 	.incbin "baserom.gba", 0xd78318, 0x38
 
-gUnknown_08D78350:: @ 8D78350
+gBattleTerrainTilemap_TallGrass:: @ 8D78350
 	.incbin "baserom.gba", 0xd78350, 0x2b0
 
-gUnknown_08D78600:: @ 8D78600
+gBattleTerrainTiles_LongGrass:: @ 8D78600
 	.incbin "baserom.gba", 0xd78600, 0x678
 
-gUnknown_08D78C78:: @ 8D78C78
+gBattleTerrainPalette_LongGrass:: @ 8D78C78
 	.incbin "baserom.gba", 0xd78C78, 0x40
 
-gUnknown_08D78CB8:: @ 8D78CB8
+gBattleTerrainTilemap_LongGrass:: @ 8D78CB8
 	.incbin "baserom.gba", 0xd78CB8, 0x2b0
 
-gUnknown_08D78F68:: @ 8D78F68
+gBattleTerrainTiles_Sand:: @ 8D78F68
 	.incbin "baserom.gba", 0xd78f68, 0x5f8
 
-gUnknown_08D79560:: @ 8D79560
+gBattleTerrainPalette_Sand:: @ 8D79560
 	.incbin "baserom.gba", 0xd79560, 0x48
 
-gUnknown_08D795A8:: @ 8D795A8
+gBattleTerrainTilemap_Sand:: @ 8D795A8
 	.incbin "baserom.gba", 0xd795A8, 0x2b0
 
-gUnknown_08D79858:: @ 8D79858
+gBattleTerrainTiles_Underwater:: @ 8D79858
 	.incbin "baserom.gba", 0xd79858, 0x5b8
 
-gUnknown_08D79E10:: @ 8D79E10
+gBattleTerrainPalette_Underwater:: @ 8D79E10
 	.incbin "baserom.gba", 0xd79E10, 0x48
 
-gUnknown_08D79E58:: @ 8D79E58
+gBattleTerrainTilemap_Underwater:: @ 8D79E58
 	.incbin "baserom.gba", 0xd79e58, 0x2b0
 
-gUnknown_08D7A108:: @ 8D7A108
+gBattleTerrainTiles_Water:: @ 8D7A108
 	.incbin "baserom.gba", 0xd7a108, 0x5d4
 
-gUnknown_08D7A6DC:: @ 8D7A6DC
+gBattleTerrainPalette_Water:: @ 8D7A6DC
 	.incbin "baserom.gba", 0xd7a6DC, 0x44
 
-gUnknown_08D7A720:: @ 8D7A720
+gBattleTerrainTilemap_Water:: @ 8D7A720
 	.incbin "baserom.gba", 0xd7a720, 0x2b0
 
-gUnknown_08D7A9D0:: @ 8D7A9D0
+gBattleTerrainTiles_PondWater:: @ 8D7A9D0
 	.incbin "baserom.gba", 0xd7a9D0, 0x5a8
 
-gUnknown_08D7AF78:: @ 8D7AF78
+gBattleTerrainPalette_PondWater:: @ 8D7AF78
 	.incbin "baserom.gba", 0xd7af78, 0x40
 
-gUnknown_08D7AFB8:: @ 8D7AFB8
+gBattleTerrainTilemap_PondWater:: @ 8D7AFB8
 	.incbin "baserom.gba", 0xd7aFB8, 0x2b0
 
-gUnknown_08D7B268:: @ 8D7B268
+gBattleTerrainTiles_Rock:: @ 8D7B268
 	.incbin "baserom.gba", 0xd7b268, 0x5c0
 
-gUnknown_08D7B828:: @ 8D7B828
+gBattleTerrainPalette_Rock:: @ 8D7B828
 	.incbin "baserom.gba", 0xd7b828, 0x3c
 
-gUnknown_08D7B864:: @ 8D7B864
+gBattleTerrainTilemap_Rock:: @ 8D7B864
 	.incbin "baserom.gba", 0xd7b864, 0x2b0
 
-gUnknown_08D7BB14:: @ 8D7BB14
+gBattleTerrainTiles_Cave:: @ 8D7BB14
 	.incbin "baserom.gba", 0xd7bb14, 0x5f8
 
-gUnknown_08D7C10C:: @ 8D7C10C
+gBattleTerrainPalette_Cave:: @ 8D7C10C
 	.incbin "baserom.gba", 0xd7c10c, 0x48
 
-gUnknown_08D7C154:: @ 8D7C154
+gBattleTerrainTilemap_Cave:: @ 8D7C154
 	.incbin "baserom.gba", 0xd7c154, 0x2b0
 
-gUnknown_08D7C404:: @ 8D7C404
+gBattleTerrainPalette_Plain:: @ 8D7C404
 	.incbin "baserom.gba", 0xd7c404, 0x3c
 
-gUnknown_08D7C440:: @ 8D7C440
+gBattleTerrainTiles_Building:: @ 8D7C440
 	.incbin "baserom.gba", 0xd7c440, 0x5ac
 
-gUnknown_08D7C9EC:: @ 8D7C9EC
+gBattleTerrainPalette_Frontier:: @ 8D7C9EC
 	.incbin "baserom.gba", 0xd7c9ec, 0x3c
 
-gUnknown_08D7CA28:: @ 8D7CA28
+gBattleTerrainTilemap_Building:: @ 8D7CA28
 	.incbin "baserom.gba", 0xd7ca28, 0x2b0
 
-gUnknown_08D7CCD8:: @ 8D7CCD8
+gBattleTerrainTiles_Stadium:: @ 8D7CCD8
 	.incbin "baserom.gba", 0xd7ccd8, 0x608
 
-gUnknown_08D7D2E0:: @ 8D7D2E0
+gBattleTerrainTilemap_Stadium:: @ 8D7D2E0
 	.incbin "baserom.gba", 0xd7d2e0, 0x2b0
 
-gUnknown_08D7D590:: @ 8D7D590
+gBattleTerrainTiles_Rayquaza:: @ 8D7D590
 	.incbin "baserom.gba", 0xd7d590, 0x674
 
-gUnknown_08D7DC04:: @ 8D7DC04
+gBattleTerrainTilemap_Rayquaza:: @ 8D7DC04
 	.incbin "baserom.gba", 0xd7dc04, 0x2b0
 
-gUnknown_08D7DEB4:: @ 8D7DEB4
+gBattleTerrainPalette_Building:: @ 8D7DEB4
 	.incbin "baserom.gba", 0xd7deb4, 0x40
 
-gUnknown_08D7DEF4:: @ 8D7DEF4
+gBattleTerrainPalette_Kyogre:: @ 8D7DEF4
 	.incbin "baserom.gba", 0xd7def4, 0x3c
 
-gUnknown_08D7DF30:: @ 8D7DF30
+gBattleTerrainPalette_Groudon:: @ 8D7DF30
 	.incbin "baserom.gba", 0xd7df30, 0x58
 
-gUnknown_08D7DF88:: @ 8D7DF88
+gBattleTerrainPalette_BuildingGym:: @ 8D7DF88
 	.incbin "baserom.gba", 0xd7df88, 0x3c
 
-gUnknown_08D7DFC4:: @ 8D7DFC4
+gBattleTerrainPalette_BuildingLeader:: @ 8D7DFC4
 	.incbin "baserom.gba", 0xd7dfc4, 0x3c
 
-gUnknown_08D7E000:: @ 8D7E000
+gBattleTerrainPalette_StadiumAqua:: @ 8D7E000
 	.incbin "baserom.gba", 0xd7e000, 0x60
 
-gUnknown_08D7E060:: @ 8D7E060
+gBattleTerrainPalette_StadiumMagma:: @ 8D7E060
 	.incbin "baserom.gba", 0xd7e060, 0x6c
 
-gUnknown_08D7E0CC:: @ 8D7E0CC
+gBattleTerrainPalette_StadiumSidney:: @ 8D7E0CC
 	.incbin "baserom.gba", 0xd7e0cc, 0x50
 
-gUnknown_08D7E11C:: @ 8D7E11C
+gBattleTerrainPalette_StadiumPhoebe:: @ 8D7E11C
 	.incbin "baserom.gba", 0xd7e11c, 0x48
 
-gUnknown_08D7E164:: @ 8D7E164
+gBattleTerrainPalette_StadiumGlacia:: @ 8D7E164
 	.incbin "baserom.gba", 0xd7e164, 0x44
 
-gUnknown_08D7E1A8:: @ 8D7E1A8
+gBattleTerrainPalette_StadiumDrake:: @ 8D7E1A8
 	.incbin "baserom.gba", 0xd7e1a8, 0x50
 
-gUnknown_08D7E1F8:: @ 8D7E1F8
+gBattleTerrainPalette_StadiumWallace:: @ 8D7E1F8
 	.incbin "baserom.gba", 0xd7e1f8, 0x3c
 
-gUnknown_08D7E234:: @ 8D7E234
+gBattleTerrainPalette_Rayquaza:: @ 8D7E234
 	.incbin "baserom.gba", 0xd7e234, 0x4c
 
-gUnknown_08D7E280:: @ 8D7E280
+gBattleTerrainAnimTiles_TallGrass:: @ 8D7E280
 	.incbin "baserom.gba", 0xd7e280, 0x588
 
-gUnknown_08D7E808:: @ 8D7E808
+gBattleTerrainAnimTilemap_TallGrass:: @ 8D7E808
 	.incbin "baserom.gba", 0xd7e808, 0x1bc
 
-gUnknown_08D7E9C4:: @ 8D7E9C4
+gBattleTerrainAnimTiles_LongGrass:: @ 8D7E9C4
 	.incbin "baserom.gba", 0xd7e9C4, 0x710
 
-gUnknown_08D7F0D4:: @ 8D7F0D4
+gBattleTerrainAnimTilemap_LongGrass:: @ 8D7F0D4
 	.incbin "baserom.gba", 0xd7F0D4, 0x238
 
-gUnknown_08D7F30C:: @ 8D7F30C
+gBattleTerrainAnimTiles_Sand:: @ 8D7F30C
 	.incbin "baserom.gba", 0xd7F30c, 0x544
 
-gUnknown_08D7F850:: @ 8D7F850
+gBattleTerrainAnimTilemap_Sand:: @ 8D7F850
 	.incbin "baserom.gba", 0xd7F850, 0x1a8
 
-gUnknown_08D7F9F8:: @ 8D7F9F8
+gBattleTerrainAnimTiles_Underwater:: @ 8D7F9F8
 	.incbin "baserom.gba", 0xd7f9f8, 0x4cc
 
-gUnknown_08D7FEC4:: @ 8D7FEC4
+gBattleTerrainAnimTilemap_Underwater:: @ 8D7FEC4
 	.incbin "baserom.gba", 0xd7fec4, 0x190
 
-gUnknown_08D80054:: @ 8D80054
+gBattleTerrainAnimTiles_Water:: @ 8D80054
 	.incbin "baserom.gba", 0xd80054, 0x60c
 
-gUnknown_08D80660:: @ 8D80660
+gBattleTerrainAnimTilemap_Water:: @ 8D80660
 	.incbin "baserom.gba", 0xd80660, 0x1a4
 
-gUnknown_08D80804:: @ 8D80804
+gBattleTerrainAnimTiles_PondWater:: @ 8D80804
 	.incbin "baserom.gba", 0xd80804, 0x54c
 
-gUnknown_08D80D50:: @ 8D80D50
+gBattleTerrainAnimTilemap_PondWater:: @ 8D80D50
 	.incbin "baserom.gba", 0xd80d50, 0x14C
 
-gUnknown_08D80E9C:: @ 8D80E9C
+gBattleTerrainAnimTiles_Rock:: @ 8D80E9C
 	.incbin "baserom.gba", 0xd80e9c, 0x5e0
 
-gUnknown_08D8147C:: @ 8D8147C
+gBattleTerrainAnimTilemap_Rock:: @ 8D8147C
 	.incbin "baserom.gba", 0xd8147C, 0x194
 
-gUnknown_08D81610:: @ 8D81610
+gBattleTerrainAnimTiles_Cave:: @ 8D81610
 	.incbin "baserom.gba", 0xd81610, 0x81c
 
-gUnknown_08D81E2C:: @ 8D81E2C
+gBattleTerrainAnimTilemap_Cave:: @ 8D81E2C
 	.incbin "baserom.gba", 0xd81e2c, 0x2a8
 
-gUnknown_08D820D4:: @ 8D820D4
+gBattleTerrainAnimTiles_Building:: @ 8D820D4
 	.incbin "baserom.gba", 0xd820d4, 0x410
 
-gUnknown_08D824E4:: @ 8D824E4
+gBattleTerrainAnimTilemap_Building:: @ 8D824E4
 	.incbin "baserom.gba", 0xd824e4, 0x124
 
-gUnknown_08D82608:: @ 8D82608
+gBattleTerrainAnimTiles_Rayquaza:: @ 8D82608
 	.incbin "baserom.gba", 0xd82608, 0x668
 
-gUnknown_08D82C70:: @ 8D82C70
+gBattleTerrainAnimTilemap_Rayquaza:: @ 8D82C70
 	.incbin "baserom.gba", 0xd82c70, 0x2a0
 
 gUnknown_08D82F10:: @ 8D82F10
@@ -880,14 +880,80 @@ gBuyMenuFrame_Tilemap:: @ 8D9B0F0
 gMenuMoneyGfx:: @ 8D9B230
     .incbin "baserom.gba", 0xd9b230, 0x84
 
-gUnknown_08D9B2B4:: @ 8D9B2B4
+gMenuPokeblock_Gfx:: @ 8D9B2B4
 	.incbin "baserom.gba", 0xd9b2b4, 0x1bc
 
-gUnknown_08D9B470:: @ 8D9B470
+gMenuPokeblock_Pal:: @ 8D9B470
-	.incbin "baserom.gba", 0xd9b470, 0x358
+	.incbin "baserom.gba", 0xd9b470, 0x70
+	
+gMenuPokeblockDevice_Gfx:: @ 8D9B4E0
+	.incbin "baserom.gba", 0xd9b4e0, 0x2c0
+	
+gMenuPokeblockDevice_Pal:: @ 8D9B7A0
+	.incbin "baserom.gba", 0xd9b7a0, 0x28
 
-gUnknown_08D9B7C8:: @ 8D9B7C8
+gMenuPokeblock_Tilemap:: @ 8D9B7C8
-	.incbin "baserom.gba", 0xd9b7c8, 0x27c
+	.incbin "baserom.gba", 0xd9b7c8, 0x148
+	
+	.align 2
+gPokeblock_Gfx::
+	.incbin "graphics/pokeblock/pokeblock.4bpp.lz"
+
+	.align 2
+gPokeblockRed_Pal::
+	.incbin "graphics/pokeblock/red.gbapal.lz"
+
+	.align 2
+gPokeblockBlue_Pal::
+	.incbin "graphics/pokeblock/blue.gbapal.lz"
+
+	.align 2
+gPokeblockPink_Pal::
+	.incbin "graphics/pokeblock/pink.gbapal.lz"
+
+	.align 2
+gPokeblockGreen_Pal::
+	.incbin "graphics/pokeblock/green.gbapal.lz"
+
+	.align 2
+gPokeblockYellow_Pal::
+	.incbin "graphics/pokeblock/yellow.gbapal.lz"
+
+	.align 2
+gPokeblockPurple_Pal::
+	.incbin "graphics/pokeblock/purple.gbapal.lz"
+
+	.align 2
+gPokeblockIndigo_Pal::
+	.incbin "graphics/pokeblock/indigo.gbapal.lz"
+
+	.align 2
+gPokeblockBrown_Pal::
+	.incbin "graphics/pokeblock/brown.gbapal.lz"
+
+	.align 2
+gPokeblockLiteBlue_Pal::
+	.incbin "graphics/pokeblock/liteblue.gbapal.lz"
+
+	.align 2
+gPokeblockOlive_Pal::
+	.incbin "graphics/pokeblock/olive.gbapal.lz"
+
+	.align 2
+gPokeblockGray_Pal::
+	.incbin "graphics/pokeblock/gray.gbapal.lz"
+
+	.align 2
+gPokeblockBlack_Pal::
+	.incbin "graphics/pokeblock/black.gbapal.lz"
+
+	.align 2
+gPokeblockWhite_Pal::
+	.incbin "graphics/pokeblock/white.gbapal.lz"
+
+	.align 2
+gPokeblockGold_Pal::
+	.incbin "graphics/pokeblock/gold.gbapal.lz"
 
 gUnknown_08D9BA44:: @ 8D9BA44
 	.incbin "baserom.gba", 0xd9ba44, 0x100
@@ -1461,8 +1527,11 @@ gUnknown_08DD4620:: @ 8DD4620
 	.incbin "baserom.gba", 0xdd4620, 0xc0
 
 gUnknown_08DD46E0:: @ 8DD46E0
-	.incbin "baserom.gba", 0xdd46e0, 0x180
+	.incbin "baserom.gba", 0xdd46e0, 0xc0
 
+gUnknown_08DD47A0:: @ 8DD47A0
+	.incbin "baserom.gba", 0xdd47a0, 0xc0
+	
 gUnknown_08DD4860:: @ 8DD4860
 	.incbin "baserom.gba", 0xdd4860, 0x20
 

data/librtc_rodata.s

@@ -13,4 +13,4 @@
 	.4byte 0x3001A7E
 	.4byte 0x3001A7E
 	.4byte 0x3001A7E
-	.4byte 0x80000C6
+	.4byte GPIOPortDirection

data/link_strings.s

@@ -1,24 +1,56 @@
-	.include "asm/macros.inc"
+    .include "asm/macros.inc"
-	.include "constants/constants.inc"
+    .include "constants/constants.inc"
 
-	.section .rodata
+    .section .rodata
 
-	.align 2
+    .align 2
-	.string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 26}others$"
+
+gUnknown_862B810:: @ 862B810
+    .string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 26}others$"
+
+gUnknown_862B832:: @ 862B832
     .string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L$"
+
+gUnknown_862B84B:: @ 862B84B
     .string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $"
+
+gUnknown_862B86C:: @ 862B86C
     .string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $"
+
+gUnknown_0862B88D:: @ 862B88D
     .string "{CLEAR 11}a{CLEAR 6}b{CLEAR 6}c{CLEAR 26}d{CLEAR 6}e{CLEAR 6}f{CLEAR 6} {CLEAR 30}.$"
+
+gUnknown_0862B8AE:: @ 862B8AE
     .string "{CLEAR 11}g{CLEAR 6}h{CLEAR 7}i{CLEAR 27}j{CLEAR 7}k{CLEAR 7}l{CLEAR 7} {CLEAR 30},$"
+
+gUnknown_0862B8CF:: @ 862B8CF
     .string "{CLEAR 11}m{CLEAR 6}n{CLEAR 6}o{CLEAR 26}p{CLEAR 6}q{CLEAR 7}r{CLEAR 6}s{CLEAR 27} $"
+
+gUnknown_0862B8F0:: @ 862B8F0
     .string "{CLEAR 11}t{CLEAR 6}u{CLEAR 6}v{CLEAR 26}w{CLEAR 6}x{CLEAR 6}y{CLEAR 6}z{CLEAR 26} $"
+
+gUnknown_0862B911:: @ 862B911
     .string "{CLEAR 11}A{CLEAR 6}B{CLEAR 6}C{CLEAR 26}D{CLEAR 6}E{CLEAR 6}F{CLEAR 6} {CLEAR 30}.$"
+
+gUnknown_0862B932:: @ 862B932
     .string "{CLEAR 11}G{CLEAR 6}H{CLEAR 6}I{CLEAR 26}J{CLEAR 6}K{CLEAR 6}L{CLEAR 6} {CLEAR 30},$"
+
+gUnknown_0862B953:: @ 862B953
     .string "{CLEAR 11}M{CLEAR 6}N{CLEAR 6}O{CLEAR 26}P{CLEAR 6}Q{CLEAR 6}R{CLEAR 6}S{CLEAR 26} $"
+
+gUnknown_0862B974:: @ 862B974
     .string "{CLEAR 11}T{CLEAR 6}U{CLEAR 6}V{CLEAR 26}W{CLEAR 6}X{CLEAR 6}Y{CLEAR 6}Z{CLEAR 26} $"
+
+gUnknown_0862B995:: @ 862B995
     .string "{CLEAR 11}0{CLEAR 16}1{CLEAR 16}2{CLEAR 16}3{CLEAR 16}4{CLEAR 16} $"
+
+gUnknown_0862B9AE:: @ 862B9AE
     .string "{CLEAR 11}5{CLEAR 16}6{CLEAR 16}7{CLEAR 16}8{CLEAR 16}9{CLEAR 16} $"
-    .string "{CLEAR 12}!{CLEAR 17}?{CLEAR 16}♂{CLEAR 16}♀{CLEAR 16}/{CLEAR 17}-$"
+ 
+gUnknown_0862B9C7:: @ 862B9C7
+   .string "{CLEAR 12}!{CLEAR 17}?{CLEAR 16}♂{CLEAR 16}♀{CLEAR 16}/{CLEAR 17}-$"
+    
+gUnknown_0862B9E0:: @ 862B9E0
     .string "{CLEAR 11}…{CLEAR 16}“{CLEAR 16}”{CLEAR 18}‘{CLEAR 19}’{CLEAR 18} $"
 
 gUnknown_0862B9F9:: @ 862B9F9

data/mauville_old_man.s

@@ -8,10 +8,24 @@ gUnknown_0859EFE4:: @ 859EFE4
 	.2byte 0x2811, 0x1029, 0x1018, 0xE0D, 0x1A1A, 0x1A1D
 
 gUnknown_0859EFF0:: @ 859EFF0
-	.incbin "baserom.gba", 0x59eff0, 0x20
+	.4byte gText_SoPretty
+	.4byte gText_SoDarling
+	.4byte gText_SoRelaxed
+	.4byte gText_SoSunny
+	.4byte gText_SoDesirable
+	.4byte gText_SoExciting
+	.4byte gText_SoAmusing
+	.4byte gText_SoMagical
 
 gUnknown_0859F010:: @ 859F010
-	.incbin "baserom.gba", 0x59f010, 0x20
+	.4byte gUnknown_08294313
+	.4byte gUnknown_08294359
+	.4byte gUnknown_08294398
+	.4byte gUnknown_082943DA
+	.4byte gUnknown_0829441C
+	.4byte gUnknown_08294460
+	.4byte gUnknown_082944A0
+	.4byte gUnknown_082944D5
 
 gUnknown_0859F030:: @ 859F030
 	.incbin "baserom.gba", 0x59f030, 0x18
@@ -23,4 +37,4 @@ gUnknown_0859F278:: @ 859F278
 	.incbin "baserom.gba", 0x59f278, 0x10
 
 gUnknown_0859F288:: @ 859F288
-	.incbin "baserom.gba", 0x59f288, 0x8
+	.4byte 0x00000024, 0x00000008

data/menu_indicators.s

@@ -10,28 +10,31 @@ gUnknown_08614244:: @ 8614244
 	.incbin "baserom.gba", 0x614244, 0x18
 
 gUnknown_0861425C:: @ 861425C
-	.incbin "baserom.gba", 0x61425c, 0x4
+	.4byte 0x00000000
 
 gUnknown_08614260:: @ 8614260
-	.incbin "baserom.gba", 0x614260, 0x4
+	.4byte 0x00100000
 
 gUnknown_08614264:: @ 8614264
-	.incbin "baserom.gba", 0x614264, 0x4
+	.4byte 0x00200000
 
 gUnknown_08614268:: @ 8614268
-	.incbin "baserom.gba", 0x614268, 0x4
+	.4byte 0x00300000
 
 gUnknown_0861426C:: @ 861426C
-	.incbin "baserom.gba", 0x61426c, 0x4
+	.4byte 0x00400000
 
 gUnknown_08614270:: @ 8614270
-	.incbin "baserom.gba", 0x614270, 0x4
+	.4byte 0x00500000
 
 gUnknown_08614274:: @ 8614274
-	.incbin "baserom.gba", 0x614274, 0x4
+	.4byte 0x00600000
 
 gUnknown_08614278:: @ 8614278
-	.incbin "baserom.gba", 0x614278, 0x18
+	.4byte 0x00700000
+
+gUnknown_0861427C:: @ 861427C
+	.incbin "baserom.gba", 0x61427C, 0x14
 
 gUnknown_08614290:: @ 8614290
 	.incbin "baserom.gba", 0x614290, 0x18

data/mystery_event_msg.s

@@ -3,32 +3,94 @@
 
 	.section .rodata
 
-gUnknown_08674AE4:: @ 8674AE4
+gText_MysteryGiftBerry:: @ 8674AE4
-	.incbin "baserom.gba", 0x674ae4, 0x32
+	.string "Obtained a {STR_VAR_2} BERRY!\nDad has it at PETALBURG GYM.$"
 
-gUnknown_08674B16:: @ 8674B16
+gText_MysteryGiftBerryTransform:: @ 8674B16
-	.incbin "baserom.gba", 0x674b16, 0x2c
+	.string "The {STR_VAR_1} BERRY transformed into\none {STR_VAR_2} BERRY.$"
 
-gUnknown_08674B42:: @ 8674B42
+gText_MysteryGiftBerryObtained:: @ 8674B42
-	.incbin "baserom.gba", 0x674b42, 0x28
+	.string "The {STR_VAR_1} BERRY has already been\nobtained.$"
 
-gUnknown_08674B6A:: @ 8674B6A
+gText_MysteryGiftSpecialRibbon:: @ 8674B6A
-	.incbin "baserom.gba", 0x674b6a, 0x34
+	.string "A special RIBBON was awarded to\nyour party POKéMON.$"
 
-gUnknown_08674B9E:: @ 8674B9E
+gText_MysteryGiftNationalDex:: @ 8674B9E
-	.incbin "baserom.gba", 0x674b9e, 0x36
+	.string "The POKéDEX has been upgraded\nwith the NATIONAL MODE.$"
 
-gUnknown_08674BD4:: @ 8674BD4
+gText_MysteryGiftRareWord:: @ 8674BD4
-	.incbin "baserom.gba", 0x674bd4, 0x1c
+	.string "A rare word has been added.$"
 
-gUnknown_08674BF0:: @ 8674BF0
+gText_MysteryGiftSentOver:: @ 8674BF0
-	.incbin "baserom.gba", 0x674bf0, 0x12
+	.string "{STR_VAR_1} was sent over!$"
 
-gUnknown_08674C02:: @ 8674C02
+gText_MysteryGiftFullParty:: @ 8674C02
-	.incbin "baserom.gba", 0x674c02, 0x2f
+	.string "Your party is full.\n{STR_VAR_1} could not be sent over.$"
 
-gUnknown_08674C31:: @ 8674C31
+gText_MysteryGiftNewTrainer:: @ 8674C31
-	.incbin "baserom.gba", 0x674c31, 0x55
+	.string "A new TRAINER has arrived in\nHOENN.$"
+	.string "A new adversary has arrived in the\nBATTLE TOWER.$"
 
-gUnknown_08674C86:: @ 8674C86
+gText_MysteryGiftCantBeUsed:: @ 8674C86
-	.incbin "baserom.gba", 0x674c86, 0xd5a
+	.string "This data can’t be used in\nthis version.$"
+	
+gUnknown_08674CAF:: @ 8674CAF
+	.incbin "baserom.gba", 0x00674caf, 0x2e
+
+gText_MysteryGiftStampCard::
+	.string "Thank you for using the STAMP CARD\nSystem.\pYou have {STR_VAR_1} more to collect to\nfill your STAMP CARD.$"
+
+gUnknown_08674D3D:: @ 8674D3D
+	.incbin "baserom.gba", 0x00674d3d, 0xa1
+
+gText_MysteryGiftEgg::
+	.string "Thank you for using the MYSTERY\nGIFT System.\pFrom the POKéMON CENTER we\nhave a gift--a POKéMON EGG!\pPlease raise it with love and\nkindness.$"
+	.string "Oh, your party appears to be full.\pPlease come see me after storing\na POKéMON on a PC.$"
+
+gUnknown_08674EC1:: @ 8674EC1
+	.incbin "baserom.gba", 0x00674ec1, 0x29
+
+gText_MysteryGiftVisitingTrainer::
+	.string "Thank you for using the MYSTERY\nGIFT System.\pBy holding this WONDER CARD, you\nmay take part in a survey at a\lPOKéMON MART.\pUse these surveys to invite\nTRAINERS to SOOTOPOLIS CITY.\p…Let me give you a secret\npassword for a survey:\p“GIVE ME\nAWESOME TRAINER”\pWrite that in on a survey and send\nit to the WIRELESS\lCOMMUNICATION SYSTEM.$"
+	.string "Thank you for using the MYSTERY\nGIFT System.\pA TRAINER has arrived in\nSOOTOPOLIS CITY looking for you.\pWe hope you will enjoy\nbattling the visiting TRAINER.\pYou may invite other TRAINERS by\nentering other passwords.\pTry looking for other passwords\nthat may work.$"
+
+gUnknown_0867513C:: @ 867513C
+	.incbin "baserom.gba", 0x0067513c, 0x48
+
+gText_MysteryGiftBattleCountCard::
+	.string "Thank you for using the MYSTERY\nGIFT System.\pYour BATTLE COUNT CARD keeps\ntrack of your battle record against\lTRAINERS with the same CARD.\pLook for and battle TRAINERS who\nhave the same CARD as you.\pYou may check the overall rankings\nby reading the NEWS.\pPlease do give it a try!$"
+	.string "Thank you for using the MYSTERY\nGIFT System.\pCongratulations!\pYou have won a prize for winning\nthree battles!\pWe hope you will be inspired to\nbattle some more.$"
+
+gUnknown_0867533C:: @ 867533C
+	.incbin "baserom.gba", 0x0067533c, 0x6d
+
+gText_MysteryGiftTicket1::
+	.string "Thank you for using the MYSTERY\nGIFT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$"
+	.string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$"
+	.string "Thank you for using the MYSTERY\nGIFT System.$"
+	.string "Oh, I’m sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$"
+
+gUnknown_0867550B:: @ 867550B
+	.incbin "baserom.gba", 0x0067550b, 0x76
+
+gText_MysteryGiftTicket2::
+	.string "Thank you for using the MYSTERY\nGIFT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$"
+	.string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$"
+	.string "Thank you for using the MYSTERY\nGIFT System.$"
+	.string "Oh, I’m sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$"
+
+gUnknown_086756E3:: @ 86756E3
+	.incbin "baserom.gba", 0x006756e3, 0x25
+
+gText_MysteryGiftAlteringCave::
+	.string "Thank you for using the MYSTERY\nGIFT System.\pThere appears to be a rumor about\nrare POKéMON sightings.\pThe sightings reportedly came from\nthe ALTERING CAVE on ROUTE 103.\pPerhaps it would be worthwhile for\nyou to investigate this rumor.$"
+
+gUnknown_086757F4:: @ 86757F4
+	.incbin "baserom.gba", 0x006757f4, 0x6d
+
+gText_MysteryGiftOldSeaMap::
+	.string "Thank you for using the MYSTERY\nGIFT System.\pLet me confirm--you are {PLAYER}?\pWe received this OLD SEA MAP\naddressed to you.$"
+	.string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$"
+	.string "Thank you for using the MYSTERY\nGIFT System.$"
+	.string "Oh, I’m sorry, {PLAYER}.\nYour BAG’s KEY ITEMS POCKET is full.\pPlease store something on your PC,\nthen come back for this.$"
+	.align 2

data/naming_screen.s

@@ -7,10 +7,14 @@ gUnknown_0858BD78:: @ 858BD78
 	.incbin "baserom.gba", 0x58bd78, 0x40
 
 gUnknown_0858BDB8:: @ 858BDB8
-	.incbin "baserom.gba", 0x58bdb8, 0x10
+	.4byte gText_PkmnTransferredSomeonesPC
+	.4byte gText_PkmnTransferredLanettesPC
+	.4byte gText_PkmnBoxSomeonesPCFull
+	.4byte gText_PkmnBoxLanettesPCFull
 
 gUnknown_0858BDC8:: @ 858BDC8
-	.incbin "baserom.gba", 0x58bdc8, 0x38
+	.string "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz!$"
+	.align 2
 
 gUnknown_0858BE00:: @ 858BE00
 	.incbin "baserom.gba", 0x58be00, 0x10
@@ -19,52 +23,67 @@ gUnknown_0858BE10:: @ 858BE10
 	.incbin "baserom.gba", 0x58be10, 0x30
 
 gUnknown_0858BE40:: @ 858BE40
-	.incbin "baserom.gba", 0x58be40, 0x60
+	.string "abcdef .ghijkl ,mnopqrs tuvwxyz ABCDEF .GHIJKL ,MNOPQRS TUVWXYZ 01234   56789   !?♂♀/-  …“”‘’   "
 
 gUnknown_0858BEA0:: @ 858BEA0
-	.incbin "baserom.gba", 0x58bea0, 0x3
+	.byte 0x08, 0x08, 0x06
 
 gUnknown_0858BEA3:: @ 858BEA3
-	.incbin "baserom.gba", 0x58bea3, 0x18
+	.byte 0x00, 0x0c, 0x18, 0x38, 0x44, 0x50, 0x5c, 0x7b, 0x00, 0x0c, 0x18, 0x38, 0x44, 0x50, 0x5c, 0x7b, 0x00, 0x16, 0x2c, 0x42, 0x58, 0x6e, 0x00, 0x00
 
 gUnknown_0858BEBB:: @ 858BEBB
-	.incbin "baserom.gba", 0x58bebb, 0x3
+	.byte 0x00, 0x02, 0x01
 
 gUnknown_0858BEBE:: @ 858BEBE
-	.incbin "baserom.gba", 0x58bebe, 0x3
+	.byte 0x01, 0x00, 0x02
 
 gUnknown_0858BEC1:: @ 858BEC1
-	.incbin "baserom.gba", 0x58bec1, 0x3
+	.byte 0x02, 0x01, 0x00
 
 gUnknown_0858BEC4:: @ 858BEC4
-	.incbin "baserom.gba", 0x58bec4, 0x10
+	.4byte sub_80E37B4
+	.4byte sub_80E37DC
+	.4byte sub_80E3870
+	.4byte sub_80E3904
 
 gUnknown_0858BED4:: @ 858BED4
-	.incbin "baserom.gba", 0x58bed4, 0x8
+	.2byte 0x0000, 0xfffc, 0xfffe, 0xffff
 
 gUnknown_0858BEDC:: @ 858BEDC
-	.incbin "baserom.gba", 0x58bedc, 0x8
+	.2byte 0x0002, 0x0003, 0x0002, 0x0001
 
 gUnknown_0858BEE4:: @ 858BEE4
-	.incbin "baserom.gba", 0x58bee4, 0x4
+	.byte 0x01, 0x02, 0x03, 0x00
 
 gUnknown_0858BEE8:: @ 858BEE8
-	.incbin "baserom.gba", 0x58bee8, 0x10
+	.4byte sub_80E40AC
+	.4byte sub_80E4100
+	.4byte sub_80E4104
+	.4byte sub_80E4178
 
 gUnknown_0858BEF8:: @ 858BEF8
-	.incbin "baserom.gba", 0x58bef8, 0x6
+	.2byte 0x0001, 0x0003, 0x0002
 
 gUnknown_0858BEFE:: @ 858BEFE
-	.incbin "baserom.gba", 0x58befe, 0x6
+	.2byte 0x0004, 0x0006, 0x0005
 
 gUnknown_0858BF04:: @ 858BF04
-	.incbin "baserom.gba", 0x58bf04, 0x14
+	.4byte TaskDummy2
+	.4byte sub_80E4384
+	.4byte sub_80E43E0
+	.4byte sub_80E4420
+	.4byte sub_80E447C
 
 gUnknown_0858BF18:: @ 858BF18
-	.incbin "baserom.gba", 0x58bf18, 0x10
+	.4byte sub_80E450C
+	.4byte sub_80E4558
+	.4byte sub_80E4580
+	.4byte sub_80E45A4
 
 gUnknown_0858BF28:: @ 858BF28
-	.incbin "baserom.gba", 0x58bf28, 0xc
+	.4byte sub_80E468C
+	.4byte sub_80E4692
+	.4byte sub_80E46E8
 
 gUnknown_0858BF34:: @ 858BF34
 	.incbin "baserom.gba", 0x58bf34, 0xa
@@ -79,29 +98,66 @@ gUnknown_0858BF50:: @ 858BF50
 	.incbin "baserom.gba", 0x58bf50, 0x8
 
 gUnknown_0858BF58:: @ 858BF58
-	.incbin "baserom.gba", 0x58bf58, 0x14
+	.4byte sub_80E4894
+	.4byte sub_80E4894
+	.4byte sub_80E48E8
+	.4byte sub_80E48E8
+	.4byte sub_80E4894
 
 gUnknown_0858BF6C:: @ 858BF6C
-	.incbin "baserom.gba", 0x58bf6c, 0x8
+	.4byte TaskDummy3
+	.4byte sub_80E49BC
 
 gUnknown_0858BF74:: @ 858BF74
-	.incbin "baserom.gba", 0x58bf74, 0x14
+	.incbin "baserom.gba", 0x58bf74, 0x8
+	
+gUnknown_0858BF7C:: @ 858BF7C
+	.4byte 0x0002010D
+	
+gUnknown_0858BF80:: @ 858BF80
+	.4byte 0x0002010E
+	
+gUnknown_0858BF84:: @ 858BF84
+	.4byte 0x0002010F
 
 gUnknown_0858BF88:: @ 858BF88
-	.incbin "baserom.gba", 0x58bf88, 0x4
+	.byte 0xee, 0xdd, 0xff, 0x00
 
 gUnknown_0858BF8C:: @ 858BF8C
-	.incbin "baserom.gba", 0x58bf8c, 0xc
+	.4byte gUnknown_0858BF80
+	.4byte gUnknown_0858BF7C
+	.4byte gUnknown_0858BF84
 
 gUnknown_0858BF98:: @ 858BF98
-	.incbin "baserom.gba", 0x58bf98, 0xc
+	.4byte gUnknown_08DD4620
+	.4byte gUnknown_08DD46E0
+	.4byte gUnknown_08DD47A0
 
 gUnknown_0858BFA4:: @ 858BFA4
-	.incbin "baserom.gba", 0x58bfa4, 0x34
+	.incbin "baserom.gba", 0x58bfa4, 0x4
+	
+gUnknown_0858BFA8:: @ 858BFA8
+	.incbin "baserom.gba", 0x58bfa8, 0xc
+
+gUnknown_0858BFB4:: @ 858BFB4
+	.incbin "baserom.gba", 0x58bfb4, 0xc
+	
+gUnknown_0858BFC0:: @ 858BFC0
+	.incbin "baserom.gba", 0x58bfc0, 0xc
+	
+gUnknown_0858BFCC:: @ 858BFCC
+	.incbin "baserom.gba", 0x58bfcc, 0xc
 
 gUnknown_0858BFD8:: @ 858BFD8
-	.incbin "baserom.gba", 0x58bfd8, 0x78
+	.4byte gUnknown_0858BFA8
+	.4byte gUnknown_0858BFB4
+	.4byte gUnknown_0858BFC0
+	.4byte gUnknown_0858BFC0
+	.4byte gUnknown_0858BFCC
 
+gUnknown_0858BFEC:: @ 858BFEC
+	.incbin "baserom.gba", 0x58bfec, 0x64
+	
 gUnknown_0858C050:: @ 858C050
 	.incbin "baserom.gba", 0x58c050, 0x8
 
@@ -142,7 +198,18 @@ gUnknown_0858C180:: @ 858C180
 	.incbin "baserom.gba", 0x58c180, 0x18
 
 gUnknown_0858C198:: @ 858C198
-	.incbin "baserom.gba", 0x58c198, 0x30
+	.4byte gUnknown_0862B88D
+	.4byte gUnknown_0862B8AE
+	.4byte gUnknown_0862B8CF
+	.4byte gUnknown_0862B8F0
+	.4byte gUnknown_0862B911
+	.4byte gUnknown_0862B932
+	.4byte gUnknown_0862B953
+	.4byte gUnknown_0862B974
+	.4byte gUnknown_0862B995
+	.4byte gUnknown_0862B9AE
+	.4byte gUnknown_0862B9C7
+	.4byte gUnknown_0862B9E0
 
 gUnknown_0858C1C8:: @ 858C1C8
 	.incbin "baserom.gba", 0x58c1c8, 0x68

data/pokeblock_feed.s

@@ -1,43 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-gUnknown_085EFEBC:: @ 85EFEBC
-	.incbin "baserom.gba", 0x5efebc, 0x32
-
-gUnknown_085EFEEE:: @ 85EFEEE
-	.incbin "baserom.gba", 0x5efeee, 0x12
-
-gUnknown_085EFF00:: @ 85EFF00
-	.incbin "baserom.gba", 0x5eff00, 0x5fc
-
-gUnknown_085F04FC:: @ 85F04FC
-	.incbin "baserom.gba", 0x5f04fc, 0x54
-
-gUnknown_085F0550:: @ 85F0550
-	.incbin "baserom.gba", 0x5f0550, 0x8
-
-gUnknown_085F0558:: @ 85F0558
-	.incbin "baserom.gba", 0x5f0558, 0x10
-
-gUnknown_085F0568:: @ 85F0568
-	.incbin "baserom.gba", 0x5f0568, 0x48
-
-gUnknown_085F05B0:: @ 85F05B0
-	.incbin "baserom.gba", 0x5f05b0, 0xb4
-
-gUnknown_085F0664:: @ 85F0664
-	.incbin "baserom.gba", 0x5f0664, 0x4
-
-gUnknown_085F0668:: @ 85F0668
-	.incbin "baserom.gba", 0x5f0668, 0x4
-
-gUnknown_085F066C:: @ 85F066C
-	.incbin "baserom.gba", 0x5f066c, 0x34
-
-gUnknown_085F06A0:: @ 85F06A0
-	.incbin "baserom.gba", 0x5f06a0, 0x8
-
-gUnknown_085F06A8:: @ 85F06A8
-	.incbin "baserom.gba", 0x5f06a8, 0x18

data/script_cmd_table.inc

@@ -94,8 +94,8 @@ gScriptCmdTable:: @ 81DB67C
 	.4byte ScrCmd_turnobject
 	.4byte ScrCmd_trainerbattle
 	.4byte ScrCmd_dotrainerbattle
-	.4byte ScrCmd_ontrainerbattleend
+	.4byte ScrCmd_gotopostbattlescript
-	.4byte ScrCmd_ontrainerbattleendgoto
+	.4byte ScrCmd_gotobeatenscript
 	.4byte ScrCmd_checktrainerflag
 	.4byte ScrCmd_settrainerflag
 	.4byte ScrCmd_cleartrainerflag
@@ -139,7 +139,7 @@ gScriptCmdTable:: @ 81DB67C
 	.4byte ScrCmd_pokemartdecoration2
 	.4byte ScrCmd_playslotmachine
 	.4byte ScrCmd_setberrytree
-	.4byte ScrCmd_choosecontestpkmn
+	.4byte ScrCmd_choosecontestmon
 	.4byte ScrCmd_startcontest
 	.4byte ScrCmd_showcontestresults
 	.4byte ScrCmd_contestlinktransfer

data/scripts/berry_tree.inc

@@ -22,7 +22,7 @@ Route102_EventScript_274359:: @ 8274359
 	lock
 	faceplayer
 	specialvar VAR_RESULT, PlayerHasBerries
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq Route102_EventScript_274374
 	message Route102_Text_2744F0
 	waitmessage
@@ -32,9 +32,9 @@ Route102_EventScript_274359:: @ 8274359
 
 Route102_EventScript_274374:: @ 8274374
 	msgbox Route102_Text_274507, 5
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq Route102_EventScript_274393
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq Route102_EventScript_2743AF
 	end
 
@@ -43,7 +43,7 @@ Route102_EventScript_274393:: @ 8274393
 	closemessage
 	special Bag_ChooseBerry
 	waitstate
-	compare_var_to_value VAR_ITEM_ID, 0
+	compare VAR_ITEM_ID, 0
 	goto_eq Route102_EventScript_2743AF
 	takeitem VAR_ITEM_ID, 1
 	call Route102_EventScript_2744DD
@@ -86,9 +86,9 @@ Route102_EventScript_2743E1:: @ 82743E1
 	goto Route102_EventScript_27448D
 
 Route102_EventScript_2743F6:: @ 82743F6
-	compare_var_to_value VAR_0x8005, 0
+	compare VAR_0x8005, 0
 	goto_eq Route102_EventScript_27441A
-	compare_var_to_value VAR_0x8005, 4
+	compare VAR_0x8005, 4
 	goto_eq Route102_EventScript_274413
 	bufferstring 1, Route102_Text_2745E5
 	return
@@ -107,14 +107,14 @@ Route102_EventScript_274421:: @ 8274421
 	faceplayer
 	special FieldObjectInteractionGetBerryCountString
 	msgbox Route102_Text_2745EE, 5
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq Route102_EventScript_274448
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq Route102_EventScript_274479
 
 Route102_EventScript_274448:: @ 8274448
 	special FieldObjectInteractionPickBerryTree
-	compare_var_to_value VAR_0x8004, 0
+	compare VAR_0x8004, 0
 	goto_eq Route102_EventScript_274470
 	special sub_80EED34
 	special FieldObjectInteractionRemoveBerryTree
@@ -152,13 +152,13 @@ Route102_EventScript_274482:: @ 8274482
 
 Route102_EventScript_27448D:: @ 827448D
 	checkitem ITEM_WAILMER_PAIL, 1
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq Route102_EventScript_2744BE
 	special FieldObjectInteractionGetBerryName
 	msgbox Route102_Text_2746E4, 5
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq Route102_EventScript_2744C4
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq Route102_EventScript_2744BE
 
 Route102_EventScript_2744BE:: @ 82744BE

data/scripts/cable_club.inc

@@ -20,10 +20,10 @@ VerdanturfTown_PokemonCenter_2F_MapScript1_276ACF: @ 8276ACF
 
 OldaleTown_PokemonCenter_2F_EventScript_276AD5:: @ 8276AD5
 	specialvar VAR_RESULT, sub_813B514
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_276AFB
 	specialvar VAR_RESULT, sub_801B27C
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_276AFF
 	goto OldaleTown_PokemonCenter_2F_EventScript_276AFB
 	end
@@ -54,7 +54,7 @@ SlateportCity_PokemonCenter_2F_EventScript_276B03:: @ 8276B03
 SootopolisCity_PokemonCenter_2F_EventScript_276B03:: @ 8276B03
 VerdanturfTown_PokemonCenter_2F_EventScript_276B03:: @ 8276B03
 	specialvar VAR_RESULT, sub_813B514
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_276B23
 	goto OldaleTown_PokemonCenter_2F_EventScript_276B19
 	end
@@ -68,7 +68,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276B1A:: @ 8276B1A
 
 OldaleTown_PokemonCenter_2F_EventScript_276B23:: @ 8276B23
 	checkitem ITEM_EON_TICKET, 1
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_276B19
 	checkflag FLAG_SYS_HAS_EON_TICKET
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_276B19
@@ -114,7 +114,7 @@ VerdanturfTown_PokemonCenter_2F_MapScript2_276B6C: @ 8276B6C
 
 MossdeepCity_GameCorner_1F_EventScript_276BAE:: @ 8276BAE
 OldaleTown_PokemonCenter_2F_EventScript_276BAE:: @ 8276BAE
-	compare_var_to_value VAR_0x8007, 0
+	compare VAR_0x8007, 0
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_276BBD
 	turnobject VAR_0x8007, 3
 
@@ -139,21 +139,21 @@ RustboroCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE
 SlateportCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE
 SootopolisCity_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE
 VerdanturfTown_PokemonCenter_2F_MapScript1_276BBE: @ 8276BBE
-	compare_var_to_value VAR_0x4087, 1
+	compare VAR_0x4087, 1
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C17
-	compare_var_to_value VAR_0x4087, 2
+	compare VAR_0x4087, 2
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C17
-	compare_var_to_value VAR_0x4087, 5
+	compare VAR_0x4087, 5
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C17
-	compare_var_to_value VAR_0x4087, 3
+	compare VAR_0x4087, 3
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C1D
-	compare_var_to_value VAR_0x4087, 4
+	compare VAR_0x4087, 4
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C23
-	compare_var_to_value VAR_0x4087, 6
+	compare VAR_0x4087, 6
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C29
-	compare_var_to_value VAR_0x4087, 7
+	compare VAR_0x4087, 7
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C2F
-	compare_var_to_value VAR_0x4087, 8
+	compare VAR_0x4087, 8
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_276C35
 	end
 
@@ -233,7 +233,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276C9D:: @ 8276C9D
 OldaleTown_PokemonCenter_2F_EventScript_276CB5:: @ 8276CB5
 	special sub_80097E8
 	setvar VAR_0x4087, 0
-	compare_var_to_value VAR_0x8007, 0
+	compare VAR_0x8007, 0
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5
 	applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_27734D
 	waitmovement 0
@@ -256,7 +256,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276CE7:: @ 8276CE7
 OldaleTown_PokemonCenter_2F_EventScript_276CFF:: @ 8276CFF
 	special sub_80097E8
 	setvar VAR_0x4087, 0
-	compare_var_to_value VAR_0x8007, 0
+	compare VAR_0x8007, 0
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5
 	applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735E
 	waitmovement 0
@@ -280,7 +280,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276D44:: @ 8276D44
 	setvar VAR_0x4087, 0
 	applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27734F
 	waitmovement 0
-	compare_var_to_value VAR_0x8007, 0
+	compare VAR_0x8007, 0
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_276D6B
 	applymovement VAR_0x8007, OldaleTown_PokemonCenter_2F_Movement_277349
 	waitmovement 0
@@ -300,7 +300,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276D6C:: @ 8276D6C
 
 OldaleTown_PokemonCenter_2F_EventScript_276D84:: @ 8276D84
 	setvar VAR_0x4087, 0
-	compare_var_to_value VAR_0x8007, 0
+	compare VAR_0x8007, 0
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_276DD5
 	applymovement 255, OldaleTown_PokemonCenter_2F_Movement_27735E
 	waitmovement 0
@@ -409,8 +409,8 @@ OldaleTown_PokemonCenter_2F_EventScript_276F23:: @ 8276F23
 	end
 
 OldaleTown_PokemonCenter_2F_EventScript_276F2E:: @ 8276F2E
-	special sub_80F92F8
+	special HasEnoughMonsForDoubleBattle
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_if 5, OldaleTown_PokemonCenter_2F_EventScript_276F47
 	setvar VAR_0x8004, 2
 	goto OldaleTown_PokemonCenter_2F_EventScript_276F60
@@ -428,28 +428,28 @@ OldaleTown_PokemonCenter_2F_EventScript_276F55:: @ 8276F55
 
 OldaleTown_PokemonCenter_2F_EventScript_276F60:: @ 8276F60
 	call OldaleTown_PokemonCenter_2F_EventScript_27134F
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
 	message OldaleTown_PokemonCenter_2F_Text_278091
 	waitmessage
 	special sub_80B2DA4
 	waitstate
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_276FBD
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772D2
-	compare_var_to_value VAR_RESULT, 3
+	compare VAR_RESULT, 3
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772DF
-	compare_var_to_value VAR_RESULT, 4
+	compare VAR_RESULT, 4
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_277046
-	compare_var_to_value VAR_RESULT, 5
+	compare VAR_RESULT, 5
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
-	compare_var_to_value VAR_RESULT, 6
+	compare VAR_RESULT, 6
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772C5
 	end
 
 OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	special copy_player_party_to_sav1
 	special copy_bags_and_unk_data_from_save_blocks
 	copyvar VAR_0x4087, VAR_0x8004
@@ -472,7 +472,7 @@ OldaleTown_PokemonCenter_2F_EventScript_276FBD:: @ 8276FBD
 	closedoor 9, 1
 	waitdooranim
 	release
-	compare_var_to_value VAR_0x8004, 5
+	compare VAR_0x8004, 5
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_277036
 	special sub_809D2BC
 	warp SINGLE_BATTLE_COLOSSEUM, 255, 6, 8
@@ -527,30 +527,30 @@ OldaleTown_PokemonCenter_2F_EventScript_2770A5:: @ 82770A5
 OldaleTown_PokemonCenter_2F_EventScript_2770B2:: @ 82770B2
 	copyvar VAR_0x8007, VAR_LAST_TALKED
 	call OldaleTown_PokemonCenter_2F_EventScript_277199
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
 	call OldaleTown_PokemonCenter_2F_EventScript_27134F
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
 	message OldaleTown_PokemonCenter_2F_Text_278091
 	waitmessage
 	special sub_80B2E4C
 	waitstate
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_27713A
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772D2
-	compare_var_to_value VAR_RESULT, 3
+	compare VAR_RESULT, 3
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772DF
-	compare_var_to_value VAR_RESULT, 4
+	compare VAR_RESULT, 4
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_27730E
-	compare_var_to_value VAR_RESULT, 5
+	compare VAR_RESULT, 5
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
-	compare_var_to_value VAR_RESULT, 6
+	compare VAR_RESULT, 6
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772C5
-	compare_var_to_value VAR_RESULT, 7
+	compare VAR_RESULT, 7
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772AB
-	compare_var_to_value VAR_RESULT, 9
+	compare VAR_RESULT, 9
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772B8
 	end
 
@@ -584,10 +584,10 @@ OldaleTown_PokemonCenter_2F_EventScript_27713A:: @ 827713A
 
 OldaleTown_PokemonCenter_2F_EventScript_277199:: @ 8277199
 	specialvar VAR_RESULT, CalculatePlayerPartyCount
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
 	goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_2771BF
 	specialvar VAR_RESULT, sub_80F9370
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_2771CD
 	setvar VAR_RESULT, 1
 	return
@@ -605,7 +605,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2771CD:: @ 82771CD
 OldaleTown_PokemonCenter_2F_EventScript_2771DB:: @ 82771DB
 	copyvar VAR_0x8007, VAR_LAST_TALKED
 	call OldaleTown_PokemonCenter_2F_EventScript_27134F
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
 	message OldaleTown_PokemonCenter_2F_Text_278091
 	waitmessage
@@ -613,19 +613,19 @@ OldaleTown_PokemonCenter_2F_EventScript_2771DB:: @ 82771DB
 	waitstate
 	special sub_80B2EA8
 	waitstate
-	compare_var_to_value VAR_RESULT, 12
+	compare VAR_RESULT, 12
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_277328
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_27724C
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772D2
-	compare_var_to_value VAR_RESULT, 3
+	compare VAR_RESULT, 3
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772DF
-	compare_var_to_value VAR_RESULT, 4
+	compare VAR_RESULT, 4
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_27730E
-	compare_var_to_value VAR_RESULT, 5
+	compare VAR_RESULT, 5
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
-	compare_var_to_value VAR_RESULT, 6
+	compare VAR_RESULT, 6
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772C5
 	end
 
@@ -809,7 +809,7 @@ gUnknown_08277388:: @ 8277388
 	fadescreen 1
 	special sub_80F9438
 	waitstate
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq DoubleBattleColosseum_EventScript_2773F4
 	setvar VAR_0x8005, 0
 	special sub_80B3968
@@ -820,7 +820,7 @@ gUnknown_082773A3:: @ 82773A3
 	fadescreen 1
 	special sub_80F9438
 	waitstate
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq DoubleBattleColosseum_EventScript_2773F4
 	setvar VAR_0x8005, 1
 	special sub_80B3968
@@ -831,7 +831,7 @@ gUnknown_082773BE:: @ 82773BE
 	fadescreen 1
 	special sub_80F9438
 	waitstate
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq DoubleBattleColosseum_EventScript_2773F4
 	setvar VAR_0x8005, 2
 	special sub_80B3968
@@ -842,7 +842,7 @@ gUnknown_082773D9:: @ 82773D9
 	fadescreen 1
 	special sub_80F9438
 	waitstate
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq DoubleBattleColosseum_EventScript_2773F4
 	setvar VAR_0x8005, 3
 	special sub_80B3968
@@ -880,7 +880,7 @@ gUnknown_0827741D:: @ 827741D
 	setvar VAR_0x8005, 0
 	special sub_80E6BE8
 	waitstate
-	compare_var_to_value VAR_0x4001, 0
+	compare VAR_0x4001, 0
 	goto_if 5, RecordCorner_EventScript_277471
 	end
 
@@ -888,7 +888,7 @@ gUnknown_08277432:: @ 8277432
 	setvar VAR_0x8005, 1
 	special sub_80E6BE8
 	waitstate
-	compare_var_to_value VAR_0x4001, 0
+	compare VAR_0x4001, 0
 	goto_if 5, RecordCorner_EventScript_277471
 	end
 
@@ -896,7 +896,7 @@ gUnknown_08277447:: @ 8277447
 	setvar VAR_0x8005, 2
 	special sub_80E6BE8
 	waitstate
-	compare_var_to_value VAR_0x4001, 0
+	compare VAR_0x4001, 0
 	goto_if 5, RecordCorner_EventScript_277471
 	end
 
@@ -904,7 +904,7 @@ gUnknown_0827745C:: @ 827745C
 	setvar VAR_0x8005, 3
 	special sub_80E6BE8
 	waitstate
-	compare_var_to_value VAR_0x4001, 0
+	compare VAR_0x4001, 0
 	goto_if 5, RecordCorner_EventScript_277471
 	end
 
@@ -950,7 +950,7 @@ TradeCenter_EventScript_2774B6:: @ 82774B6
 	end
 
 RecordCorner_EventScript_2774C6:: @ 82774C6
-	compare_var_to_value VAR_0x4000, 0
+	compare VAR_0x4000, 0
 	goto_if 5, RecordCorner_EventScript_2774E0
 	special sub_8098574
 	message RecordCorner_Text_27861C
@@ -971,7 +971,7 @@ RecordCorner_EventScript_2774E0:: @ 82774E0
 
 gUnknown_082774EF:: @ 82774EF
 	msgbox Text_2783A8, 5
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq gUnknown_08277509
 	erasebox 0, 0, 29, 19
 	releaseall
@@ -996,11 +996,11 @@ OldaleTown_PokemonCenter_2F_EventScript_27751B:: @ 827751B
 	checkflag FLAG_SYS_POKEDEX_GET
 	goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_277335
 	specialvar VAR_RESULT, sub_813990C
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_27731B
 	copyvar VAR_0x8007, VAR_LAST_TALKED
 	specialvar VAR_RESULT, sub_80093CC
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_277668
 	message OldaleTown_PokemonCenter_2F_Text_27940D
 	waitmessage
@@ -1024,14 +1024,14 @@ OldaleTown_PokemonCenter_2F_EventScript_277593:: @ 8277593
 
 OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F
 	call OldaleTown_PokemonCenter_2F_EventScript_277626
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
 	call OldaleTown_PokemonCenter_2F_EventScript_27134F
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
 	msgbox OldaleTown_PokemonCenter_2F_Text_27961C, 4
 	closemessage
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	setvar VAR_0x8004, 6
 	copyvar VAR_0x4087, VAR_0x8004
 	call OldaleTown_PokemonCenter_2F_EventScript_277BBE
@@ -1059,10 +1059,10 @@ OldaleTown_PokemonCenter_2F_EventScript_27759F:: @ 827759F
 
 OldaleTown_PokemonCenter_2F_EventScript_277626:: @ 8277626
 	specialvar VAR_RESULT, CountPartyNonEggMons
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
 	goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_27764C
 	specialvar VAR_RESULT, sub_80F9370
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_27765A
 	setvar VAR_RESULT, 1
 	return
@@ -1088,7 +1088,7 @@ OldaleTown_PokemonCenter_2F_EventScript_277672:: @ 8277672
 	checkflag FLAG_SYS_POKEDEX_GET
 	goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_277335
 	msgbox OldaleTown_PokemonCenter_2F_Text_279937, 5
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_27769A
 	msgbox OldaleTown_PokemonCenter_2F_Text_2799AA, 4
 	release
@@ -1106,10 +1106,10 @@ OldaleTown_PokemonCenter_2F_EventScript_2776A4:: @ 82776A4
 	checkflag FLAG_SYS_POKEDEX_GET
 	goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_277335
 	specialvar VAR_RESULT, sub_813990C
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_27731B
 	specialvar VAR_RESULT, sub_80093CC
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_276E13
 	message OldaleTown_PokemonCenter_2F_Text_279013
 	waitmessage
@@ -1119,7 +1119,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2776A4:: @ 82776A4
 
 OldaleTown_PokemonCenter_2F_EventScript_2776E3:: @ 82776E3
 	checkitem ITEM_POWDER_JAR, 1
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_27778B
 	checkflag FLAG_VISITED_MAUVILLE_CITY
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_27773E
@@ -1166,10 +1166,10 @@ OldaleTown_PokemonCenter_2F_EventScript_2777CB:: @ 82777CB
 
 OldaleTown_PokemonCenter_2F_EventScript_27780D:: @ 827780D
 	msgbox OldaleTown_PokemonCenter_2F_Text_27909D, 5
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
 	call OldaleTown_PokemonCenter_2F_EventScript_277199
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
 	setvar VAR_0x8004, 3
 	goto OldaleTown_PokemonCenter_2F_EventScript_277931
@@ -1194,8 +1194,8 @@ OldaleTown_PokemonCenter_2F_EventScript_27788E:: @ 827788E
 	end
 
 OldaleTown_PokemonCenter_2F_EventScript_277899:: @ 8277899
-	special sub_80F92F8
+	special HasEnoughMonsForDoubleBattle
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_if 5, OldaleTown_PokemonCenter_2F_EventScript_2778B2
 	setvar VAR_0x8004, 1
 	goto OldaleTown_PokemonCenter_2F_EventScript_277931
@@ -1218,7 +1218,7 @@ OldaleTown_PokemonCenter_2F_EventScript_2778CB:: @ 82778CB
 
 OldaleTown_PokemonCenter_2F_EventScript_2778D9:: @ 82778D9
 	msgbox OldaleTown_PokemonCenter_2F_Text_2790E8, 5
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
 	setvar VAR_0x8004, 12
 	goto OldaleTown_PokemonCenter_2F_EventScript_277931
@@ -1226,10 +1226,10 @@ OldaleTown_PokemonCenter_2F_EventScript_2778D9:: @ 82778D9
 
 OldaleTown_PokemonCenter_2F_EventScript_2778F7:: @ 82778F7
 	msgbox OldaleTown_PokemonCenter_2F_Text_279114, 5
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
 	special HasAtLeastOneBerry
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_277923
 	setvar VAR_0x8004, 5
 	goto OldaleTown_PokemonCenter_2F_EventScript_277931
@@ -1242,7 +1242,7 @@ OldaleTown_PokemonCenter_2F_EventScript_277923:: @ 8277923
 
 OldaleTown_PokemonCenter_2F_EventScript_277931:: @ 8277931
 	call OldaleTown_PokemonCenter_2F_EventScript_27134F
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_2772EC
 	switch VAR_0x8004
 	case 3, OldaleTown_PokemonCenter_2F_EventScript_277989
@@ -1266,22 +1266,22 @@ OldaleTown_PokemonCenter_2F_EventScript_277989:: @ 8277989
 
 OldaleTown_PokemonCenter_2F_EventScript_2779C6:: @ 82779C6
 	call OldaleTown_PokemonCenter_2F_EventScript_277B30
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A
-	compare_var_to_value VAR_RESULT, 5
+	compare VAR_RESULT, 5
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_277989
-	compare_var_to_value VAR_RESULT, 8
+	compare VAR_RESULT, 8
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_2779C6
 	release
 	return
 
 OldaleTown_PokemonCenter_2F_EventScript_2779EE:: @ 82779EE
 	call OldaleTown_PokemonCenter_2F_EventScript_277B35
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A
-	compare_var_to_value VAR_RESULT, 5
+	compare VAR_RESULT, 5
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_277989
-	compare_var_to_value VAR_RESULT, 8
+	compare VAR_RESULT, 8
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_2779EE
 	release
 	return
@@ -1299,22 +1299,22 @@ OldaleTown_PokemonCenter_2F_EventScript_277A16:: @ 8277A16
 
 OldaleTown_PokemonCenter_2F_EventScript_277A53:: @ 8277A53
 	call OldaleTown_PokemonCenter_2F_EventScript_277B30
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A
-	compare_var_to_value VAR_RESULT, 5
+	compare VAR_RESULT, 5
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_277A16
-	compare_var_to_value VAR_RESULT, 8
+	compare VAR_RESULT, 8
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_277A53
 	release
 	return
 
 OldaleTown_PokemonCenter_2F_EventScript_277A7B:: @ 8277A7B
 	call OldaleTown_PokemonCenter_2F_EventScript_277B35
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A
-	compare_var_to_value VAR_RESULT, 5
+	compare VAR_RESULT, 5
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_277A16
-	compare_var_to_value VAR_RESULT, 8
+	compare VAR_RESULT, 8
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_277A7B
 	release
 	return
@@ -1332,22 +1332,22 @@ OldaleTown_PokemonCenter_2F_EventScript_277AA3:: @ 8277AA3
 
 OldaleTown_PokemonCenter_2F_EventScript_277AE0:: @ 8277AE0
 	call OldaleTown_PokemonCenter_2F_EventScript_277B30
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A
-	compare_var_to_value VAR_RESULT, 5
+	compare VAR_RESULT, 5
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_277AA3
-	compare_var_to_value VAR_RESULT, 8
+	compare VAR_RESULT, 8
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_277AE0
 	release
 	return
 
 OldaleTown_PokemonCenter_2F_EventScript_277B08:: @ 8277B08
 	call OldaleTown_PokemonCenter_2F_EventScript_277B35
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_277B3A
-	compare_var_to_value VAR_RESULT, 5
+	compare VAR_RESULT, 5
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_277AA3
-	compare_var_to_value VAR_RESULT, 8
+	compare VAR_RESULT, 8
 	goto_eq OldaleTown_PokemonCenter_2F_EventScript_277B08
 	release
 	return
@@ -1397,7 +1397,7 @@ OldaleTown_PokemonCenter_2F_EventScript_277B8A:: @ 8277B8A
 	checkflag FLAG_SYS_POKEDEX_GET
 	goto_if 0, OldaleTown_PokemonCenter_2F_EventScript_27733F
 	specialvar VAR_RESULT, sub_80093CC
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq EventScript_277BB4
 	fadescreen 1
 	special sub_801A42C
@@ -1496,7 +1496,7 @@ MossdeepCity_GameCorner_1F_EventScript_277C91:: @ 8277C91
 	message MossdeepCity_GameCorner_1F_Text_278CEB
 	waitmessage
 	specialvar VAR_RESULT, sub_80093CC
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq MossdeepCity_GameCorner_1F_EventScript_277E48
 	delay 60
 	message MossdeepCity_GameCorner_1F_Text_278DAD
@@ -1512,17 +1512,17 @@ MossdeepCity_GameCorner_1F_EventScript_277C91:: @ 8277C91
 MossdeepCity_GameCorner_1F_EventScript_277CE9:: @ 8277CE9
 	setvar VAR_0x8005, 0
 	special sub_802C920
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq MossdeepCity_GameCorner_1F_EventScript_277E55
 	msgbox MossdeepCity_GameCorner_1F_Text_278DD9, 4
 	fadescreen 1
 	setvar VAR_0x8005, 0
 	special sub_81B8958
 	waitstate
-	compare_var_to_value VAR_0x8004, 6
+	compare VAR_0x8004, 6
 	goto_if 4, MossdeepCity_GameCorner_1F_EventScript_2772F9
 	call MossdeepCity_GameCorner_1F_EventScript_27134F
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq MossdeepCity_GameCorner_1F_EventScript_2772F9
 	setvar VAR_0x8004, 4
 	goto MossdeepCity_GameCorner_1F_EventScript_277D81
@@ -1531,17 +1531,17 @@ MossdeepCity_GameCorner_1F_EventScript_277CE9:: @ 8277CE9
 MossdeepCity_GameCorner_1F_EventScript_277D35:: @ 8277D35
 	setvar VAR_0x8005, 1
 	special sub_8027A5C
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq MossdeepCity_GameCorner_1F_EventScript_277E55
 	msgbox MossdeepCity_GameCorner_1F_Text_278DD9, 4
 	fadescreen 1
 	setvar VAR_0x8005, 1
 	special sub_81B8958
 	waitstate
-	compare_var_to_value VAR_0x8004, 6
+	compare VAR_0x8004, 6
 	goto_if 4, MossdeepCity_GameCorner_1F_EventScript_2772F9
 	call MossdeepCity_GameCorner_1F_EventScript_27134F
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq MossdeepCity_GameCorner_1F_EventScript_2772F9
 	setvar VAR_0x8004, 6
 	goto MossdeepCity_GameCorner_1F_EventScript_277D81
@@ -1560,22 +1560,22 @@ MossdeepCity_GameCorner_1F_EventScript_277D81:: @ 8277D81
 
 MossdeepCity_GameCorner_1F_EventScript_277DBE:: @ 8277DBE
 	call MossdeepCity_GameCorner_1F_EventScript_277B30
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq MossdeepCity_GameCorner_1F_EventScript_277E0E
-	compare_var_to_value VAR_RESULT, 5
+	compare VAR_RESULT, 5
 	goto_eq MossdeepCity_GameCorner_1F_EventScript_277D81
-	compare_var_to_value VAR_RESULT, 8
+	compare VAR_RESULT, 8
 	goto_eq MossdeepCity_GameCorner_1F_EventScript_277DBE
 	release
 	return
 
 MossdeepCity_GameCorner_1F_EventScript_277DE6:: @ 8277DE6
 	call MossdeepCity_GameCorner_1F_EventScript_277B35
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq MossdeepCity_GameCorner_1F_EventScript_277E0E
-	compare_var_to_value VAR_RESULT, 5
+	compare VAR_RESULT, 5
 	goto_eq MossdeepCity_GameCorner_1F_EventScript_277D81
-	compare_var_to_value VAR_RESULT, 8
+	compare VAR_RESULT, 8
 	goto_eq MossdeepCity_GameCorner_1F_EventScript_277DE6
 	release
 	return
@@ -1608,11 +1608,11 @@ MossdeepCity_GameCorner_1F_EventScript_277E48:: @ 8277E48
 
 MossdeepCity_GameCorner_1F_EventScript_277E55:: @ 8277E55
 	msgbox MossdeepCity_GameCorner_1F_Text_278E60, 5
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq MossdeepCity_GameCorner_1F_EventScript_2772F9
-	compare_var_to_value VAR_0x8005, 0
+	compare VAR_0x8005, 0
 	call_if 1, MossdeepCity_GameCorner_1F_EventScript_277E84
-	compare_var_to_value VAR_0x8005, 1
+	compare VAR_0x8005, 1
 	call_if 1, MossdeepCity_GameCorner_1F_EventScript_277E8D
 	goto MossdeepCity_GameCorner_1F_EventScript_2772F9
 	end

data/scripts/contest_hall.inc

@@ -1,7 +1,7 @@
 LilycoveCity_ContestLobby_EventScript_279CC5:: @ 8279CC5
 	lock
 	faceplayer
-	compare_var_to_value VAR_0x408A, 0
+	compare VAR_0x408A, 0
 	goto_if 5, LilycoveCity_ContestLobby_EventScript_279D13
 	checkflag FLAG_0x05F
 	call_if 1, LilycoveCity_ContestLobby_EventScript_279CEA
@@ -29,7 +29,7 @@ LilycoveCity_ContestLobby_EventScript_279D13:: @ 8279D13
 
 LilycoveCity_ContestLobby_EventScript_279D2C:: @ 8279D2C
 	giveitem_std ITEM_LUXURY_BALL
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq LilycoveCity_ContestLobby_EventScript_279D4B
 	setvar VAR_0x408A, 0
 	closemessage
@@ -87,19 +87,19 @@ LilycoveCity_ContestLobby_EventScript_279E09:: @ 8279E09
 
 LilycoveCity_ContestLobby_EventScript_279E13:: @ 8279E13
 	msgbox LilycoveCity_ContestLobby_Text_27B44A, 4
-	choosecontestpkmn
+	choosecontestmon
-	compare_var_to_value VAR_0x8004, 255
+	compare VAR_0x8004, 255
 	goto_eq LilycoveCity_ContestLobby_EventScript_279E09
 	special sub_80F7F30
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq LilycoveCity_ContestLobby_EventScript_279F12
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq LilycoveCity_ContestLobby_EventScript_279F87
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
 	goto_eq LilycoveCity_ContestLobby_EventScript_279F45
-	compare_var_to_value VAR_RESULT, 3
+	compare VAR_RESULT, 3
 	goto_eq LilycoveCity_ContestLobby_EventScript_279F69
-	compare_var_to_value VAR_RESULT, 4
+	compare VAR_RESULT, 4
 	goto_eq LilycoveCity_ContestLobby_EventScript_279F78
 	end
 
@@ -273,7 +273,7 @@ LinkContestRoom1_EventScript_27A097:: @ 827A097
 	return
 
 LinkContestRoom1_EventScript_27A0B1:: @ 827A0B1
-	compare_var_to_value VAR_0x4088, 5
+	compare VAR_0x4088, 5
 	goto_eq LinkContestRoom1_EventScript_27A0C7
 	lockall
 	msgbox LinkContestRoom1_Text_27B711, 4
@@ -282,7 +282,7 @@ LinkContestRoom1_EventScript_27A0B1:: @ 827A0B1
 
 LinkContestRoom1_EventScript_27A0C7:: @ 827A0C7
 	specialvar VAR_RESULT, sub_80F9160
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq LinkContestRoom1_EventScript_27A0DE
 	messageautoscroll LinkContestRoom1_Text_27B78F
 	waitmessage
@@ -306,7 +306,7 @@ LinkContestRoom1_EventScript_27A0F5:: @ 827A0F5
 	call LinkContestRoom1_EventScript_27A133
 	call LinkContestRoom1_EventScript_27A133
 	addvar VAR_0x8006, 1
-	compare_var_to_value VAR_0x8006, 4
+	compare VAR_0x8006, 4
 	goto_if 5, LinkContestRoom1_EventScript_27A0F5
 	call LinkContestRoom1_EventScript_27A230
 	setvar VAR_0x4001, 6
@@ -314,7 +314,7 @@ LinkContestRoom1_EventScript_27A0F5:: @ 827A0F5
 
 LinkContestRoom1_EventScript_27A133:: @ 827A133
 	specialvar VAR_RESULT, sub_80F9160
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq LinkContestRoom1_EventScript_27A144
 	return
 
@@ -324,13 +324,13 @@ LinkContestRoom1_EventScript_27A144:: @ 827A144
 	return
 
 LinkContestRoom1_EventScript_27A149:: @ 827A149
-	compare_var_to_value VAR_0x8006, 0
+	compare VAR_0x8006, 0
 	goto_eq LinkContestRoom1_EventScript_27A176
-	compare_var_to_value VAR_0x8006, 1
+	compare VAR_0x8006, 1
 	goto_eq LinkContestRoom1_EventScript_27A18D
-	compare_var_to_value VAR_0x8006, 2
+	compare VAR_0x8006, 2
 	goto_eq LinkContestRoom1_EventScript_27A1A4
-	compare_var_to_value VAR_0x8006, 3
+	compare VAR_0x8006, 3
 	goto_eq LinkContestRoom1_EventScript_27A1BB
 	return
 
@@ -393,7 +393,7 @@ LinkContestRoom1_EventScript_27A1D2:: @ 827A1D2
 	return
 
 LinkContestRoom1_EventScript_27A217:: @ 827A217
-	compare_var_to_value VAR_0x4088, 5
+	compare VAR_0x4088, 5
 	goto_eq LinkContestRoom1_EventScript_27A229
 	message LinkContestRoom1_Text_27B815
 	waitmessage
@@ -421,14 +421,14 @@ LinkContestRoom1_EventScript_27A230:: @ 827A230
 	return
 
 LinkContestRoom1_EventScript_27A26C:: @ 827A26C
-	compare_var_to_value VAR_0x4088, 5
+	compare VAR_0x4088, 5
 	goto_eq LinkContestRoom1_EventScript_27A280
 	msgbox LinkContestRoom1_Text_27B830, 4
 	return
 
 LinkContestRoom1_EventScript_27A280:: @ 827A280
 	specialvar VAR_RESULT, sub_80F9160
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq LinkContestRoom1_EventScript_27A297
 	messageautoscroll LinkContestRoom1_Text_27B830
 	waitmessage
@@ -447,7 +447,7 @@ LinkContestRoom1_EventScript_27A297:: @ 827A297
 	return
 
 LinkContestRoom1_EventScript_27A2B9:: @ 827A2B9
-	compare_var_to_value VAR_0x4088, 5
+	compare VAR_0x4088, 5
 	goto_eq LinkContestRoom1_EventScript_27A2CA
 	message LinkContestRoom1_Text_27B8F2
 	return
@@ -485,15 +485,15 @@ LinkContestRoom1_EventScript_27A2D5:: @ 827A2D5
 
 LinkContestRoom1_EventScript_27A34F:: @ 827A34F
 	special sub_80F82FC
-	compare_var_to_value VAR_0x4088, 1
+	compare VAR_0x4088, 1
 	call_if 1, LinkContestRoom1_EventScript_27A454
-	compare_var_to_value VAR_0x4088, 2
+	compare VAR_0x4088, 2
 	call_if 1, LinkContestRoom1_EventScript_27A4B2
-	compare_var_to_value VAR_0x4088, 3
+	compare VAR_0x4088, 3
 	call_if 1, LinkContestRoom1_EventScript_27A510
-	compare_var_to_value VAR_0x4088, 4
+	compare VAR_0x4088, 4
 	call_if 1, LinkContestRoom1_EventScript_27A56E
-	compare_var_to_value VAR_0x4088, 5
+	compare VAR_0x4088, 5
 	call_if 1, LinkContestRoom1_EventScript_27A5CC
 	setvar VAR_0x4001, 9
 	setvar VAR_0x4002, 9
@@ -503,7 +503,7 @@ LinkContestRoom1_EventScript_27A34F:: @ 827A34F
 	setvar VAR_0x4006, 9
 	setvar VAR_0x4007, 9
 	setvar VAR_0x4008, 9
-	compare_var_to_value VAR_0x4000, 0
+	compare VAR_0x4000, 0
 	call_if 2, LinkContestRoom1_EventScript_27A3E5
 	setvar VAR_0x4001, 0
 	setvar VAR_0x4002, 0
@@ -518,123 +518,123 @@ LinkContestRoom1_EventScript_27A34F:: @ 827A34F
 LinkContestRoom1_EventScript_27A3E5:: @ 827A3E5
 	setvar VAR_RESULT, 8
 	special sub_80F8FE8
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	call_if 1, LinkContestRoom1_EventScript_27A65A
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	call_if 1, LinkContestRoom1_EventScript_27A67E
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
 	call_if 1, LinkContestRoom1_EventScript_27A6A2
-	compare_var_to_value VAR_RESULT, 3
+	compare VAR_RESULT, 3
 	call_if 1, LinkContestRoom1_EventScript_27A6C6
-	compare_var_to_value VAR_RESULT, 4
+	compare VAR_RESULT, 4
 	call_if 1, LinkContestRoom1_EventScript_27A6EA
-	compare_var_to_value VAR_RESULT, 5
+	compare VAR_RESULT, 5
 	call_if 1, LinkContestRoom1_EventScript_27A70E
-	compare_var_to_value VAR_RESULT, 6
+	compare VAR_RESULT, 6
 	call_if 1, LinkContestRoom1_EventScript_27A732
-	compare_var_to_value VAR_RESULT, 7
+	compare VAR_RESULT, 7
 	call_if 1, LinkContestRoom1_EventScript_27A756
-	compare_var_to_value VAR_0x4000, 0
+	compare VAR_0x4000, 0
 	goto_if 2, LinkContestRoom1_EventScript_27A3E5
 	waitmovement 0
 	return
 
 LinkContestRoom1_EventScript_27A454:: @ 827A454
-	compare_var_to_value VAR_0x8004, 80
+	compare VAR_0x8004, 80
 	goto_if 2, LinkContestRoom1_EventScript_27A654
-	compare_var_to_value VAR_0x8004, 70
+	compare VAR_0x8004, 70
 	goto_if 2, LinkContestRoom1_EventScript_27A64E
-	compare_var_to_value VAR_0x8004, 60
+	compare VAR_0x8004, 60
 	goto_if 2, LinkContestRoom1_EventScript_27A648
-	compare_var_to_value VAR_0x8004, 50
+	compare VAR_0x8004, 50
 	goto_if 2, LinkContestRoom1_EventScript_27A642
-	compare_var_to_value VAR_0x8004, 40
+	compare VAR_0x8004, 40
 	goto_if 2, LinkContestRoom1_EventScript_27A63C
-	compare_var_to_value VAR_0x8004, 30
+	compare VAR_0x8004, 30
 	goto_if 2, LinkContestRoom1_EventScript_27A636
-	compare_var_to_value VAR_0x8004, 20
+	compare VAR_0x8004, 20
 	goto_if 2, LinkContestRoom1_EventScript_27A630
-	compare_var_to_value VAR_0x8004, 10
+	compare VAR_0x8004, 10
 	goto_if 2, LinkContestRoom1_EventScript_27A62A
 	setvar VAR_0x4000, 0
 	return
 
 LinkContestRoom1_EventScript_27A4B2:: @ 827A4B2
-	compare_var_to_value VAR_0x8004, 230
+	compare VAR_0x8004, 230
 	goto_if 2, LinkContestRoom1_EventScript_27A654
-	compare_var_to_value VAR_0x8004, 210
+	compare VAR_0x8004, 210
 	goto_if 2, LinkContestRoom1_EventScript_27A64E
-	compare_var_to_value VAR_0x8004, 190
+	compare VAR_0x8004, 190
 	goto_if 2, LinkContestRoom1_EventScript_27A648
-	compare_var_to_value VAR_0x8004, 170
+	compare VAR_0x8004, 170
 	goto_if 2, LinkContestRoom1_EventScript_27A642
-	compare_var_to_value VAR_0x8004, 150
+	compare VAR_0x8004, 150
 	goto_if 2, LinkContestRoom1_EventScript_27A63C
-	compare_var_to_value VAR_0x8004, 130
+	compare VAR_0x8004, 130
 	goto_if 2, LinkContestRoom1_EventScript_27A636
-	compare_var_to_value VAR_0x8004, 110
+	compare VAR_0x8004, 110
 	goto_if 2, LinkContestRoom1_EventScript_27A630
-	compare_var_to_value VAR_0x8004, 90
+	compare VAR_0x8004, 90
 	goto_if 2, LinkContestRoom1_EventScript_27A62A
 	setvar VAR_0x4000, 0
 	return
 
 LinkContestRoom1_EventScript_27A510:: @ 827A510
-	compare_var_to_value VAR_0x8004, 380
+	compare VAR_0x8004, 380
 	goto_if 2, LinkContestRoom1_EventScript_27A654
-	compare_var_to_value VAR_0x8004, 350
+	compare VAR_0x8004, 350
 	goto_if 2, LinkContestRoom1_EventScript_27A64E
-	compare_var_to_value VAR_0x8004, 320
+	compare VAR_0x8004, 320
 	goto_if 2, LinkContestRoom1_EventScript_27A648
-	compare_var_to_value VAR_0x8004, 290
+	compare VAR_0x8004, 290
 	goto_if 2, LinkContestRoom1_EventScript_27A642
-	compare_var_to_value VAR_0x8004, 260
+	compare VAR_0x8004, 260
 	goto_if 2, LinkContestRoom1_EventScript_27A63C
-	compare_var_to_value VAR_0x8004, 230
+	compare VAR_0x8004, 230
 	goto_if 2, LinkContestRoom1_EventScript_27A636
-	compare_var_to_value VAR_0x8004, 200
+	compare VAR_0x8004, 200
 	goto_if 2, LinkContestRoom1_EventScript_27A630
-	compare_var_to_value VAR_0x8004, 170
+	compare VAR_0x8004, 170
 	goto_if 2, LinkContestRoom1_EventScript_27A62A
 	setvar VAR_0x4000, 0
 	return
 
 LinkContestRoom1_EventScript_27A56E:: @ 827A56E
-	compare_var_to_value VAR_0x8004, 600
+	compare VAR_0x8004, 600
 	goto_if 2, LinkContestRoom1_EventScript_27A654
-	compare_var_to_value VAR_0x8004, 560
+	compare VAR_0x8004, 560
 	goto_if 2, LinkContestRoom1_EventScript_27A64E
-	compare_var_to_value VAR_0x8004, 520
+	compare VAR_0x8004, 520
 	goto_if 2, LinkContestRoom1_EventScript_27A648
-	compare_var_to_value VAR_0x8004, 480
+	compare VAR_0x8004, 480
 	goto_if 2, LinkContestRoom1_EventScript_27A642
-	compare_var_to_value VAR_0x8004, 440
+	compare VAR_0x8004, 440
 	goto_if 2, LinkContestRoom1_EventScript_27A63C
-	compare_var_to_value VAR_0x8004, 400
+	compare VAR_0x8004, 400
 	goto_if 2, LinkContestRoom1_EventScript_27A636
-	compare_var_to_value VAR_0x8004, 360
+	compare VAR_0x8004, 360
 	goto_if 2, LinkContestRoom1_EventScript_27A630
-	compare_var_to_value VAR_0x8004, 320
+	compare VAR_0x8004, 320
 	goto_if 2, LinkContestRoom1_EventScript_27A62A
 	setvar VAR_0x4000, 0
 	return
 
 LinkContestRoom1_EventScript_27A5CC:: @ 827A5CC
-	compare_var_to_value VAR_0x8004, 600
+	compare VAR_0x8004, 600
 	goto_if 2, LinkContestRoom1_EventScript_27A654
-	compare_var_to_value VAR_0x8004, 550
+	compare VAR_0x8004, 550
 	goto_if 2, LinkContestRoom1_EventScript_27A64E
-	compare_var_to_value VAR_0x8004, 500
+	compare VAR_0x8004, 500
 	goto_if 2, LinkContestRoom1_EventScript_27A648
-	compare_var_to_value VAR_0x8004, 450
+	compare VAR_0x8004, 450
 	goto_if 2, LinkContestRoom1_EventScript_27A642
-	compare_var_to_value VAR_0x8004, 400
+	compare VAR_0x8004, 400
 	goto_if 2, LinkContestRoom1_EventScript_27A63C
-	compare_var_to_value VAR_0x8004, 300
+	compare VAR_0x8004, 300
 	goto_if 2, LinkContestRoom1_EventScript_27A636
-	compare_var_to_value VAR_0x8004, 200
+	compare VAR_0x8004, 200
 	goto_if 2, LinkContestRoom1_EventScript_27A630
-	compare_var_to_value VAR_0x8004, 100
+	compare VAR_0x8004, 100
 	goto_if 2, LinkContestRoom1_EventScript_27A62A
 	setvar VAR_0x4000, 0
 	return
@@ -672,7 +672,7 @@ LinkContestRoom1_EventScript_27A654:: @ 827A654
 	return
 
 LinkContestRoom1_EventScript_27A65A:: @ 827A65A
-	compare_var_to_value VAR_0x4001, 1
+	compare VAR_0x4001, 1
 	goto_eq LinkContestRoom1_EventScript_27A67D
 	applymovement 6, LinkContestRoom1_Movement_27AD11
 	playse SE_PIN
@@ -685,7 +685,7 @@ LinkContestRoom1_EventScript_27A67D:: @ 827A67D
 	return
 
 LinkContestRoom1_EventScript_27A67E:: @ 827A67E
-	compare_var_to_value VAR_0x4002, 1
+	compare VAR_0x4002, 1
 	goto_eq LinkContestRoom1_EventScript_27A6A1
 	applymovement 12, LinkContestRoom1_Movement_27AD11
 	playse SE_PIN
@@ -698,7 +698,7 @@ LinkContestRoom1_EventScript_27A6A1:: @ 827A6A1
 	return
 
 LinkContestRoom1_EventScript_27A6A2:: @ 827A6A2
-	compare_var_to_value VAR_0x4003, 1
+	compare VAR_0x4003, 1
 	goto_eq LinkContestRoom1_EventScript_27A6C5
 	applymovement 7, LinkContestRoom1_Movement_27AD11
 	playse SE_PIN
@@ -711,7 +711,7 @@ LinkContestRoom1_EventScript_27A6C5:: @ 827A6C5
 	return
 
 LinkContestRoom1_EventScript_27A6C6:: @ 827A6C6
-	compare_var_to_value VAR_0x4004, 1
+	compare VAR_0x4004, 1
 	goto_eq LinkContestRoom1_EventScript_27A6E9
 	applymovement 8, LinkContestRoom1_Movement_27AD11
 	playse SE_PIN
@@ -724,7 +724,7 @@ LinkContestRoom1_EventScript_27A6E9:: @ 827A6E9
 	return
 
 LinkContestRoom1_EventScript_27A6EA:: @ 827A6EA
-	compare_var_to_value VAR_0x4005, 1
+	compare VAR_0x4005, 1
 	goto_eq LinkContestRoom1_EventScript_27A70D
 	applymovement 9, LinkContestRoom1_Movement_27AD11
 	playse SE_PIN
@@ -737,7 +737,7 @@ LinkContestRoom1_EventScript_27A70D:: @ 827A70D
 	return
 
 LinkContestRoom1_EventScript_27A70E:: @ 827A70E
-	compare_var_to_value VAR_0x4006, 1
+	compare VAR_0x4006, 1
 	goto_eq LinkContestRoom1_EventScript_27A731
 	applymovement 10, LinkContestRoom1_Movement_27AD11
 	playse SE_PIN
@@ -750,7 +750,7 @@ LinkContestRoom1_EventScript_27A731:: @ 827A731
 	return
 
 LinkContestRoom1_EventScript_27A732:: @ 827A732
-	compare_var_to_value VAR_0x4007, 1
+	compare VAR_0x4007, 1
 	goto_eq LinkContestRoom1_EventScript_27A755
 	applymovement 11, LinkContestRoom1_Movement_27AD11
 	playse SE_PIN
@@ -763,7 +763,7 @@ LinkContestRoom1_EventScript_27A755:: @ 827A755
 	return
 
 LinkContestRoom1_EventScript_27A756:: @ 827A756
-	compare_var_to_value VAR_0x4008, 1
+	compare VAR_0x4008, 1
 	goto_eq LinkContestRoom1_EventScript_27A779
 	applymovement 15, LinkContestRoom1_Movement_27AD11
 	playse SE_PIN
@@ -845,14 +845,14 @@ LinkContestRoom1_EventScript_27A801:: @ 827A801
 	return
 
 LinkContestRoom1_EventScript_27A853:: @ 827A853
-	compare_var_to_value VAR_0x4088, 5
+	compare VAR_0x4088, 5
 	goto_eq LinkContestRoom1_EventScript_27A867
 	msgbox LinkContestRoom1_Text_27B904, 4
 	return
 
 LinkContestRoom1_EventScript_27A867:: @ 827A867
 	specialvar VAR_RESULT, sub_80F9160
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq LinkContestRoom1_EventScript_27A87E
 	messageautoscroll LinkContestRoom1_Text_27B904
 	waitmessage
@@ -895,7 +895,7 @@ LinkContestRoom1_EventScript_27A8A5:: @ 827A8A5
 	return
 
 LinkContestRoom1_EventScript_27A8FB:: @ 827A8FB
-	compare_var_to_value VAR_0x4088, 5
+	compare VAR_0x4088, 5
 	goto_eq LinkContestRoom1_EventScript_27A90F
 	msgbox LinkContestRoom1_Text_27BA15, 4
 	return
@@ -908,7 +908,7 @@ LinkContestRoom1_EventScript_27A90F:: @ 827A90F
 	return
 
 LinkContestRoom1_EventScript_27A91E:: @ 827A91E
-	compare_var_to_value VAR_0x4088, 5
+	compare VAR_0x4088, 5
 	goto_eq LinkContestRoom1_EventScript_27A932
 	msgbox LinkContestRoom1_Text_27BA30, 4
 	return
@@ -921,7 +921,7 @@ LinkContestRoom1_EventScript_27A932:: @ 827A932
 	return
 
 LinkContestRoom1_EventScript_27A941:: @ 827A941
-	compare_var_to_value VAR_0x4088, 5
+	compare VAR_0x4088, 5
 	goto_eq LinkContestRoom1_EventScript_27A955
 	msgbox LinkContestRoom1_Text_27BAAC, 4
 	return
@@ -934,7 +934,7 @@ LinkContestRoom1_EventScript_27A955:: @ 827A955
 	return
 
 LinkContestRoom1_EventScript_27A964:: @ 827A964
-	compare_var_to_value VAR_0x4088, 5
+	compare VAR_0x4088, 5
 	goto_eq LinkContestRoom1_EventScript_27A978
 	msgbox LinkContestRoom1_Text_27BB25, 4
 	return
@@ -985,7 +985,7 @@ LinkContestRoom1_EventScript_27A9D4:: @ 827A9D4
 	return
 
 LinkContestRoom1_EventScript_27AA00:: @ 827AA00
-	compare_var_to_value VAR_0x4088, 5
+	compare VAR_0x4088, 5
 	goto_eq LinkContestRoom1_EventScript_27AA14
 	msgbox LinkContestRoom1_Text_27BB4C, 4
 	return
@@ -998,7 +998,7 @@ LinkContestRoom1_EventScript_27AA14:: @ 827AA14
 LinkContestRoom1_EventScript_27AA1B:: @ 827AA1B
 	addvar VAR_0x4001, 1
 	lockall
-	compare_var_to_value VAR_0x4088, 1
+	compare VAR_0x4088, 1
 	call_if 2, LinkContestRoom1_EventScript_27AA6F
 	applymovement 9, LinkContestRoom1_Movement_27AD3B
 	applymovement 12, LinkContestRoom1_Movement_27AD3F
@@ -1008,7 +1008,7 @@ LinkContestRoom1_EventScript_27AA1B:: @ 827AA1B
 	applymovement 11, LinkContestRoom1_Movement_27AD3F
 	applymovement 6, LinkContestRoom1_Movement_27AD37
 	applymovement 8, LinkContestRoom1_Movement_27AD33
-	compare_var_to_value VAR_0x4001, 4
+	compare VAR_0x4001, 4
 	goto_if 5, LinkContestRoom1_EventScript_27AA1B
 	delay 30
 	return
@@ -1083,7 +1083,7 @@ LinkContestRoom1_EventScript_27AA6F:: @ 827AA6F
 	return
 
 LinkContestRoom1_EventScript_27AB36:: @ 827AB36
-	compare_var_to_value VAR_0x4088, 5
+	compare VAR_0x4088, 5
 	goto_eq LinkContestRoom1_EventScript_27ABD8
 	call LinkContestRoom1_EventScript_27AB9E
 	checkflag FLAG_0x002
@@ -1098,7 +1098,7 @@ LinkContestRoom1_EventScript_27AB36:: @ 827AB36
 	call LinkContestRoom1_EventScript_27AA1B
 	delay 30
 	special sub_80F88E8
-	compare_var_to_value VAR_0x8004, 1
+	compare VAR_0x8004, 1
 	goto_eq LinkContestRoom1_EventScript_27ABD2
 	return
 
@@ -1108,24 +1108,24 @@ LinkContestRoom1_EventScript_27AB82:: @ 827AB82
 	releaseall
 	delay 90
 	special sub_80F88E8
-	compare_var_to_value VAR_0x8004, 1
+	compare VAR_0x8004, 1
 	goto_eq LinkContestRoom1_EventScript_27ABD2
 	return
 
 LinkContestRoom1_EventScript_27AB9E:: @ 827AB9E
 	specialvar VAR_RESULT, sub_80F7F7C
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq LinkContestRoom1_EventScript_27ABAF
 	return
 
 LinkContestRoom1_EventScript_27ABAF:: @ 827ABAF
 	special sub_80F831C
-	compare_var_to_value VAR_0x8005, 3
+	compare VAR_0x8005, 3
 	goto_eq LinkContestRoom1_EventScript_27ABBE
 	return
 
 LinkContestRoom1_EventScript_27ABBE:: @ 827ABBE
-	compare_var_to_value VAR_CONTEST_RANK, 3
+	compare VAR_CONTEST_RANK, 3
 	goto_eq LinkContestRoom1_EventScript_27ABCD
 	setflag FLAG_0x002
 	return
@@ -1146,7 +1146,7 @@ LinkContestRoom1_EventScript_27ABD8:: @ 827ABD8
 	special sub_80F84B0
 	special sub_80F831C
 	special sub_80F88E8
-	compare_var_to_value VAR_0x8004, 1
+	compare VAR_0x8004, 1
 	goto_eq LinkContestRoom1_EventScript_27ABF1
 	closemessage
 	return
@@ -1196,7 +1196,7 @@ LinkContestRoom1_EventScript_27AC51:: @ 827AC51
 
 LinkContestRoom1_EventScript_27AC5E:: @ 827AC5E
 	special sub_80F831C
-	compare_var_to_value VAR_0x8005, 3
+	compare VAR_0x8005, 3
 	goto_eq LinkContestRoom1_EventScript_27AC77
 	lockall
 	msgbox LinkContestRoom1_Text_27BB7A, 4
@@ -1204,12 +1204,12 @@ LinkContestRoom1_EventScript_27AC5E:: @ 827AC5E
 	return
 
 LinkContestRoom1_EventScript_27AC77:: @ 827AC77
-	compare_var_to_value VAR_0x4088, 2
+	compare VAR_0x4088, 2
 	call_if 1, LinkContestRoom1_EventScript_27ABCE
 	specialvar VAR_RESULT, sub_80F7F7C
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq LinkContestRoom1_EventScript_27ACDF
-	compare_var_to_value VAR_CONTEST_RANK, 3
+	compare VAR_CONTEST_RANK, 3
 	goto_eq LinkContestRoom1_EventScript_27ACBD
 	lockall
 	msgbox LinkContestRoom1_Text_27BB7A, 4
@@ -1226,7 +1226,7 @@ LinkContestRoom1_EventScript_27ACA8:: @ 827ACA8
 
 LinkContestRoom1_EventScript_27ACBD:: @ 827ACBD
 	giveitem_std ITEM_LUXURY_BALL
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq LinkContestRoom1_EventScript_27ACA8
 	lockall
 	msgbox LinkContestRoom1_Text_27BB7A, 4
@@ -1432,7 +1432,7 @@ LinkContestRoom1_Movement_27AD7E: @ 827AD7E
 
 LinkContestRoom1_EventScript_27AD80:: @ 827AD80
 	specialvar VAR_RESULT, sub_80F9134
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq LinkContestRoom1_EventScript_27AD91
 	return
 
@@ -1441,7 +1441,7 @@ LinkContestRoom1_EventScript_27AD91:: @ 827AD91
 
 LilycoveCity_ContestLobby_EventScript_27AD92:: @ 827AD92
 	specialvar VAR_RESULT, sub_80F9134
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq LilycoveCity_ContestLobby_EventScript_27ADA3
 	return
 

data/scripts/day_care.inc

@@ -3,11 +3,11 @@ Route117_EventScript_291C18:: @ 8291C18
 	faceplayer
 	special GetDaycareMonNicknames
 	specialvar VAR_RESULT, GetDaycareState
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq Route117_EventScript_291C4D
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
 	goto_eq Route117_EventScript_291CD1
-	compare_var_to_value VAR_RESULT, 3
+	compare VAR_RESULT, 3
 	goto_eq Route117_EventScript_291CE8
 	msgbox Route117_Text_291FCF, 4
 	release
@@ -15,10 +15,10 @@ Route117_EventScript_291C18:: @ 8291C18
 
 Route117_EventScript_291C4D:: @ 8291C4D
 	msgbox Route117_Text_29205D, 5
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq Route117_EventScript_291C83
 	msgbox Route117_Text_2922C6, 5
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq Route117_EventScript_291C83
 	msgbox Route117_Text_292149, 4
 	clearflag FLAG_PENDING_DAYCARE_EGG
@@ -28,7 +28,7 @@ Route117_EventScript_291C4D:: @ 8291C4D
 
 Route117_EventScript_291C83:: @ 8291C83
 	specialvar VAR_RESULT, CalculatePlayerPartyCount
-	compare_var_to_value VAR_RESULT, 6
+	compare VAR_RESULT, 6
 	goto_if 5, Route117_EventScript_291C9D
 	msgbox Route117_Text_29216A, 4
 	release
@@ -47,7 +47,7 @@ Route117_EventScript_291C9D:: @ 8291C9D
 
 Route117_EventScript_291CB7:: @ 8291CB7
 	specialvar VAR_RESULT, sub_8071614
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	call_if 1, Route117_EventScript_291CC8
 	return
 
@@ -81,14 +81,14 @@ Route117_PokemonDayCare_EventScript_291D11:: @ 8291D11
 	lock
 	faceplayer
 	specialvar VAR_RESULT, GetDaycareState
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq Route117_PokemonDayCare_EventScript_291E0B
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
 	goto_eq Route117_PokemonDayCare_EventScript_291E2F
-	compare_var_to_value VAR_RESULT, 3
+	compare VAR_RESULT, 3
 	goto_eq Route117_PokemonDayCare_EventScript_291F5C
 	msgbox Route117_PokemonDayCare_Text_2922F4, 5
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq Route117_PokemonDayCare_EventScript_291D56
 	msgbox Route117_PokemonDayCare_Text_292416, 4
 	release
@@ -96,19 +96,19 @@ Route117_PokemonDayCare_EventScript_291D11:: @ 8291D11
 
 Route117_PokemonDayCare_EventScript_291D56:: @ 8291D56
 	specialvar VAR_RESULT, CountPartyNonEggMons
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq Route117_PokemonDayCare_EventScript_291DED
 	specialvar VAR_RESULT, sub_80722E0
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
 	goto_eq Route117_PokemonDayCare_EventScript_291E01
 	msgbox Route117_PokemonDayCare_Text_292349, 4
 	fadescreen 1
 	special ChooseSendDaycareMon
 	waitstate
-	compare_var_to_value VAR_0x8004, 255
+	compare VAR_0x8004, 255
 	goto_eq Route117_PokemonDayCare_EventScript_291DCA
 	specialvar VAR_RESULT, CountPartyAliveNonEggMons_IgnoreVar0x8004Slot
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq Route117_PokemonDayCare_EventScript_291DF7
 	specialvar VAR_0x8005, GetSelectedMonNickAndSpecies
 	waitse
@@ -118,7 +118,7 @@ Route117_PokemonDayCare_EventScript_291D56:: @ 8291D56
 	special StoreSelectedPokemonInDaycare
 	incrementgamestat 47
 	specialvar VAR_RESULT, GetDaycareState
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
 	goto_eq Route117_PokemonDayCare_EventScript_291DD4
 	release
 	end
@@ -130,7 +130,7 @@ Route117_PokemonDayCare_EventScript_291DCA:: @ 8291DCA
 
 Route117_PokemonDayCare_EventScript_291DD4:: @ 8291DD4
 	msgbox Route117_PokemonDayCare_Text_2923AF, 5
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq Route117_PokemonDayCare_EventScript_291D56
 	goto Route117_PokemonDayCare_EventScript_291DCA
 	end
@@ -161,7 +161,7 @@ Route117_PokemonDayCare_EventScript_291E15:: @ 8291E15
 
 Route117_PokemonDayCare_EventScript_291E1E:: @ 8291E1E
 	specialvar VAR_RESULT, GetNumLevelsGainedFromDaycare
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	call_if 5, Route117_PokemonDayCare_EventScript_291E15
 	return
 
@@ -170,26 +170,26 @@ Route117_PokemonDayCare_EventScript_291E2F:: @ 8291E2F
 	setvar VAR_0x8004, 0
 	call Route117_PokemonDayCare_EventScript_291E1E
 	msgbox Route117_PokemonDayCare_Text_2923AF, 5
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq Route117_PokemonDayCare_EventScript_291D56
 	msgbox Route117_PokemonDayCare_Text_2925F6, 5
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq Route117_PokemonDayCare_EventScript_291E6D
 	goto Route117_PokemonDayCare_EventScript_291DCA
 	end
 
 Route117_PokemonDayCare_EventScript_291E6D:: @ 8291E6D
 	specialvar VAR_RESULT, CalculatePlayerPartyCount
-	compare_var_to_value VAR_RESULT, 6
+	compare VAR_RESULT, 6
 	goto_eq Route117_PokemonDayCare_EventScript_291F3D
 	specialvar VAR_RESULT, GetDaycareState
 	setvar VAR_0x8004, 0
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
 	goto_eq Route117_PokemonDayCare_EventScript_291EAC
 	special ShowDaycareLevelMenu
 	waitstate
 	copyvar VAR_0x8004, VAR_RESULT
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
 	goto_eq Route117_PokemonDayCare_EventScript_291DCA
 	goto Route117_PokemonDayCare_EventScript_291EAC
 	end
@@ -197,14 +197,14 @@ Route117_PokemonDayCare_EventScript_291E6D:: @ 8291E6D
 Route117_PokemonDayCare_EventScript_291EAC:: @ 8291EAC
 	special GetDaycareCost
 	msgbox Route117_PokemonDayCare_Text_292549, 5
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq Route117_PokemonDayCare_EventScript_291EC8
 	goto Route117_PokemonDayCare_EventScript_291DCA
 	end
 
 Route117_PokemonDayCare_EventScript_291EC8:: @ 8291EC8
 	specialvar VAR_RESULT, IsEnoughForCostInVar0x8005
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq Route117_PokemonDayCare_EventScript_291EE2
 	msgbox Route117_PokemonDayCare_Text_292432, 4
 	release
@@ -222,14 +222,14 @@ Route117_PokemonDayCare_EventScript_291EE2:: @ 8291EE2
 	msgbox Route117_PokemonDayCare_Text_292593, 4
 	waitmoncry
 	specialvar VAR_RESULT, GetDaycareState
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
 	goto_eq Route117_PokemonDayCare_EventScript_291F24
 	goto Route117_PokemonDayCare_EventScript_291DCA
 	end
 
 Route117_PokemonDayCare_EventScript_291F24:: @ 8291F24
 	msgbox Route117_PokemonDayCare_Text_29244F, 5
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq Route117_PokemonDayCare_EventScript_291E6D
 	goto Route117_PokemonDayCare_EventScript_291DCA
 	end
@@ -271,7 +271,7 @@ Route117_PokemonDayCare_EventScript_291F5C:: @ 8291F5C
 	setvar VAR_0x8004, 1
 	call Route117_PokemonDayCare_EventScript_291E1E
 	msgbox Route117_PokemonDayCare_Text_2925F6, 5
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq Route117_PokemonDayCare_EventScript_291E6D
 	msgbox Route117_PokemonDayCare_Text_292476, 4
 	release
@@ -280,7 +280,7 @@ Route117_PokemonDayCare_EventScript_291F5C:: @ 8291F5C
 Route117_PokemonDayCare_EventScript_291F95:: @ 8291F95
 	special ShowDaycareLevelMenu
 	waitstate
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
 	goto_eq Route117_PokemonDayCare_EventScript_291DCA
 	copyvar VAR_0x8004, VAR_RESULT
 	specialvar VAR_RESULT, TakePokemonFromDaycare

data/scripts/field_move_scripts.inc

@@ -13,13 +13,13 @@ Route123_EventScript_2906BB:: @ 82906BB
 	checkflag FLAG_BADGE01_GET
 	goto_if 0, Route103_EventScript_290721
 	checkpartymove MOVE_CUT
-	compare_var_to_value VAR_RESULT, 6
+	compare VAR_RESULT, 6
 	goto_eq Route103_EventScript_290721
 	setfieldeffectargument 0, VAR_RESULT
 	bufferpartymonnick 0, VAR_RESULT
 	buffermovename 1, MOVE_CUT
 	msgbox Route103_Text_29072E, 5
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq Route103_EventScript_29072B
 	msgbox Route103_Text_290771, 4
 	closemessage
@@ -87,13 +87,13 @@ VictoryRoad_B1F_EventScript_2907A6:: @ 82907A6
 	checkflag FLAG_BADGE03_GET
 	goto_if 0, Route111_EventScript_29082D
 	checkpartymove MOVE_ROCK_SMASH
-	compare_var_to_value VAR_RESULT, 6
+	compare VAR_RESULT, 6
 	goto_eq Route111_EventScript_29082D
 	setfieldeffectargument 0, VAR_RESULT
 	bufferpartymonnick 0, VAR_RESULT
 	buffermovename 1, MOVE_ROCK_SMASH
 	msgbox Route111_Text_29083A, 5
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq Route111_EventScript_290837
 	msgbox Route111_Text_290771, 4
 	closemessage
@@ -114,10 +114,10 @@ Route111_EventScript_2907FB:: @ 82907FB
 	waitmovement 0
 	removeobject VAR_LAST_TALKED
 	specialvar VAR_RESULT, sub_81393FC
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq Route111_EventScript_290829
 	special RockSmashWildEncounter
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq Route111_EventScript_290829
 	waitstate
 	releaseall
@@ -165,11 +165,11 @@ VictoryRoad_B1F_EventScript_2908BA:: @ 82908BA
 	checkflag FLAG_SYS_USE_STRENGTH
 	goto_eq FieryPath_EventScript_29091F
 	checkpartymove MOVE_STRENGTH
-	compare_var_to_value VAR_RESULT, 6
+	compare VAR_RESULT, 6
 	goto_eq FieryPath_EventScript_290915
 	setfieldeffectargument 0, VAR_RESULT
 	msgbox FieryPath_Text_29092C, 5
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq FieryPath_EventScript_290929
 	closemessage
 	dofieldeffect 40
@@ -226,12 +226,12 @@ FieryPath_Text_290A16: @ 8290A16
 EventScript_290A49:: @ 8290A49
 	lockall
 	checkpartymove MOVE_WATERFALL
-	compare_var_to_value VAR_RESULT, 6
+	compare VAR_RESULT, 6
 	goto_eq EventScript_290A84
 	bufferpartymonnick 0, VAR_RESULT
 	setfieldeffectargument 0, VAR_RESULT
 	msgbox Text_290AC3, 5
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq EventScript_290A8C
 	msgbox Text_290AFC, 4
 	dofieldeffect 43
@@ -261,13 +261,13 @@ Text_290AFC: @ 8290AFC
 EventScript_290B0F:: @ 8290B0F
 	lockall
 	checkpartymove MOVE_DIVE
-	compare_var_to_value VAR_RESULT, 6
+	compare VAR_RESULT, 6
 	goto_eq EventScript_290B4E
 	bufferpartymonnick 0, VAR_RESULT
 	setfieldeffectargument 0, VAR_RESULT
 	setfieldeffectargument 1, 1
 	msgbox Text_290BE8, 5
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq EventScript_290B58
 	msgbox Text_290C1A, 4
 	dofieldeffect 44
@@ -286,13 +286,13 @@ EventScript_290B58:: @ 8290B58
 EventScript_290B5A:: @ 8290B5A
 	lockall
 	checkpartymove MOVE_DIVE
-	compare_var_to_value VAR_RESULT, 6
+	compare VAR_RESULT, 6
 	goto_eq EventScript_290B99
 	bufferpartymonnick 0, VAR_RESULT
 	setfieldeffectargument 0, VAR_RESULT
 	setfieldeffectargument 1, 1
 	msgbox Text_290C6E, 5
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq EventScript_290BA8
 	msgbox Text_290C1A, 4
 	dofieldeffect 44

data/scripts/gabby_and_ty.inc

@@ -1,7 +1,7 @@
 EventScript_28CCAA:: @ 828CCAA
 	setvar VAR_0x8005, 8
 	special InterviewBefore
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq EventScript_28CCC6
 	setvar VAR_0x8005, 8
 	special InterviewAfter
@@ -214,11 +214,11 @@ Route120_EventScript_28CF36:: @ 828CF36
 Route111_EventScript_28CF56:: @ 828CF56
 	special GabbyAndTyBeforeInterview
 	special GabbyAndTySetScriptVarsToFieldObjectLocalIds
-	compare_var_to_value VAR_FACING, 2
+	compare VAR_FACING, 2
 	call_if 1, Route111_EventScript_28CF94
-	compare_var_to_value VAR_FACING, 1
+	compare VAR_FACING, 1
 	call_if 1, Route111_EventScript_28CF9F
-	compare_var_to_value VAR_FACING, 4
+	compare VAR_FACING, 4
 	call_if 1, Route111_EventScript_28CFB1
 	checkflag FLAG_0x001
 	goto_eq Route111_EventScript_28D0EE
@@ -248,16 +248,16 @@ Route118_EventScript_28CFC3:: @ 828CFC3
 Route120_EventScript_28CFC3:: @ 828CFC3
 	special GabbyAndTyBeforeInterview
 	special GabbyAndTySetScriptVarsToFieldObjectLocalIds
-	compare_var_to_value VAR_FACING, 2
+	compare VAR_FACING, 2
 	call_if 1, Route111_EventScript_28CF94
-	compare_var_to_value VAR_FACING, 1
+	compare VAR_FACING, 1
 	call_if 1, Route111_EventScript_28CF9F
-	compare_var_to_value VAR_FACING, 4
+	compare VAR_FACING, 4
 	call_if 1, Route111_EventScript_28CFB1
 	checkflag FLAG_0x001
 	goto_eq Route111_EventScript_28D0EE
 	specialvar VAR_RESULT, GabbyAndTyGetLastQuote
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq Route111_EventScript_28D053
 	msgbox Route111_Text_28B137, 4
 	specialvar VAR_RESULT, GabbyAndTyGetLastBattleTrivia
@@ -312,14 +312,14 @@ Route111_EventScript_28D099:: @ 828D099
 	end
 
 Route111_EventScript_28D0A7:: @ 828D0A7
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq Route111_EventScript_28D0E1
 	msgbox Route111_Text_28B433, 4
 	setvar VAR_0x8004, 10
 	call Route111_EventScript_271E7C
 	lock
 	faceplayer
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq Route111_EventScript_28D0E1
 	msgbox Route111_Text_28B4AB, 4
 	special GabbyAndTyAfterInterview

data/scripts/maps/AbandonedShip_CaptainsOffice.inc

@@ -7,7 +7,7 @@ AbandonedShip_CaptainsOffice_EventScript_2387E2:: @ 82387E2
 	checkflag FLAG_0x126
 	goto_eq AbandonedShip_CaptainsOffice_EventScript_23881A
 	checkitem ITEM_SCANNER, 1
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq AbandonedShip_CaptainsOffice_EventScript_238810
 	checkflag FLAG_0x436
 	goto_eq AbandonedShip_CaptainsOffice_EventScript_23881A

data/scripts/maps/AbandonedShip_Corridors_B1F.inc

@@ -31,7 +31,7 @@ AbandonedShip_Corridors_B1F_EventScript_237DC8:: @ 8237DC8
 	checkflag FLAG_0x0EF
 	goto_eq AbandonedShip_Corridors_B1F_EventScript_237E09
 	checkitem ITEM_STORAGE_KEY, 1
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq AbandonedShip_Corridors_B1F_EventScript_237DFF
 	msgbox AbandonedShip_Corridors_B1F_Text_237F4B, 4
 	playse SE_PIN

data/scripts/maps/AbandonedShip_HiddenFloorCorridors.inc

@@ -63,7 +63,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A19:: @ 8238A19
 	checkflag FLAG_0x0F0
 	goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
 	checkitem ITEM_ROOM_1_KEY, 1
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AF5
 	msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4
 	playse SE_PIN
@@ -79,7 +79,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A50:: @ 8238A50
 	checkflag FLAG_0x0F1
 	goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
 	checkitem ITEM_ROOM_2_KEY, 1
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238AFF
 	msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4
 	playse SE_PIN
@@ -95,7 +95,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238A87:: @ 8238A87
 	checkflag FLAG_0x0F2
 	goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
 	checkitem ITEM_ROOM_4_KEY, 1
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B09
 	msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4
 	playse SE_PIN
@@ -111,7 +111,7 @@ AbandonedShip_HiddenFloorCorridors_EventScript_238ABE:: @ 8238ABE
 	checkflag FLAG_0x0F3
 	goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B1D
 	checkitem ITEM_ROOM_6_KEY, 1
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq AbandonedShip_HiddenFloorCorridors_EventScript_238B13
 	msgbox AbandonedShip_HiddenFloorCorridors_Text_238BF7, 4
 	playse SE_PIN

data/scripts/maps/AbandonedShip_HiddenFloorRooms.inc

@@ -10,11 +10,11 @@ AbandonedShip_HiddenFloorRooms_EventScript_238C59:: @ 8238C59
 	setvar VAR_0x4001, 1
 	getplayerxy VAR_0x4002, VAR_0x4003
 	setvar VAR_0x4004, 1
-	compare_var_to_value VAR_0x4002, 21
+	compare VAR_0x4002, 21
 	call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238CD1
-	compare_var_to_value VAR_0x4002, 36
+	compare VAR_0x4002, 36
 	call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238CD7
-	compare_var_to_value VAR_0x4003, 2
+	compare VAR_0x4003, 2
 	call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238CDD
 	switch VAR_0x4004
 	case 1, AbandonedShip_HiddenFloorRooms_EventScript_238CE3
@@ -44,7 +44,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238CE3:: @ 8238CE3
 	setfieldeffectargument 2, 0
 	dofieldeffect 54
 	specialvar VAR_RESULT, sub_81392F8
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DD3
 	waitfieldeffect 54
 	delay 10
@@ -55,10 +55,10 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D0C:: @ 8238D0C
 
 AbandonedShip_HiddenFloorRooms_EventScript_238D0D:: @ 8238D0D
 	specialvar VAR_RESULT, sub_81392AC
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq AbandonedShip_HiddenFloorRooms_EventScript_238D32
 	delay 20
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DB3
 	waitfieldeffect 54
 	delay 10
@@ -78,7 +78,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D33:: @ 8238D33
 	setfieldeffectargument 2, 0
 	dofieldeffect 54
 	specialvar VAR_RESULT, sub_8139320
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DE3
 	waitfieldeffect 54
 	delay 10
@@ -99,7 +99,7 @@ AbandonedShip_HiddenFloorRooms_EventScript_238D6B:: @ 8238D6B
 	setfieldeffectargument 2, 0
 	dofieldeffect 54
 	specialvar VAR_RESULT, sub_81392D4
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	call_if 1, AbandonedShip_HiddenFloorRooms_EventScript_238DC3
 	waitfieldeffect 54
 	delay 10

data/scripts/maps/AbandonedShip_Rooms2_1F.inc

@@ -3,8 +3,8 @@ AbandonedShip_Rooms2_1F_MapScripts:: @ 82380A6
 
 AbandonedShip_Rooms2_1F_EventScript_2380A7:: @ 82380A7
 	trainerbattle 6, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_23819D, AbandonedShip_Rooms2_1F_Text_2381DA, AbandonedShip_Rooms2_1F_Text_238257, AbandonedShip_Rooms2_1F_EventScript_2380D7
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq AbandonedShip_Rooms2_1F_EventScript_2380F0
 	msgbox AbandonedShip_Rooms2_1F_Text_23820F, 4
 	release
@@ -26,8 +26,8 @@ AbandonedShip_Rooms2_1F_EventScript_2380F0:: @ 82380F0
 
 AbandonedShip_Rooms2_1F_EventScript_23810B:: @ 823810B
 	trainerbattle 6, TRAINER_KIRA_AND_DAN_1, 0, AbandonedShip_Rooms2_1F_Text_2382A4, AbandonedShip_Rooms2_1F_Text_2382F4, AbandonedShip_Rooms2_1F_Text_23836F, AbandonedShip_Rooms2_1F_EventScript_23813B
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq AbandonedShip_Rooms2_1F_EventScript_238154
 	msgbox AbandonedShip_Rooms2_1F_Text_23830A, 4
 	release

data/scripts/maps/AbandonedShip_Rooms_1F.inc

@@ -12,8 +12,8 @@ AbandonedShip_Rooms_1F_EventScript_237A9C:: @ 8237A9C
 
 AbandonedShip_Rooms_1F_EventScript_237AB3:: @ 8237AB3
 	trainerbattle 2, TRAINER_THALIA_1, 0, AbandonedShip_Rooms_1F_Text_237B76, AbandonedShip_Rooms_1F_Text_237BB8, AbandonedShip_Rooms_1F_EventScript_237ADF
-	specialvar VAR_RESULT, sub_80B226C
+	specialvar VAR_RESULT, ShouldTryRematchBattle
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq AbandonedShip_Rooms_1F_EventScript_237AFE
 	msgbox AbandonedShip_Rooms_1F_Text_237BDB, 4
 	release

data/scripts/maps/AncientTomb.inc

@@ -11,7 +11,7 @@ AncientTomb_MapScript1_238FC3: @ 8238FC3
 
 AncientTomb_EventScript_238FCD:: @ 8238FCD
 	specialvar VAR_RESULT, sub_8138B80
-	compare_var_to_value VAR_RESULT, 7
+	compare VAR_RESULT, 7
 	goto_if 5, AncientTomb_EventScript_27374E
 	removeobject VAR_LAST_TALKED
 	return
@@ -72,15 +72,15 @@ AncientTomb_EventScript_23905A:: @ 823905A
 	waitmoncry
 	setwildbattle SPECIES_REGISTEEL, 40, ITEM_NONE
 	setflag FLAG_SYS_CTRL_OBJ_DELETE
-	special sub_80B0A74
+	special StartRegiBattle
 	waitstate
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	specialvar VAR_RESULT, sub_8138B80
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq AncientTomb_EventScript_2390A1
-	compare_var_to_value VAR_RESULT, 4
+	compare VAR_RESULT, 4
 	goto_eq AncientTomb_EventScript_2390AA
-	compare_var_to_value VAR_RESULT, 5
+	compare VAR_RESULT, 5
 	goto_eq AncientTomb_EventScript_2390AA
 	setflag FLAG_0x1BD
 	release

data/scripts/maps/AquaHideout_B1F.inc

@@ -10,7 +10,7 @@ AquaHideout_B1F_MapScript1_2339B2: @ 82339B2
 
 AquaHideout_B1F_EventScript_2339BC:: @ 82339BC
 	specialvar VAR_RESULT, sub_8138B80
-	compare_var_to_value VAR_RESULT, 7
+	compare VAR_RESULT, 7
 	goto_if 5, AquaHideout_B1F_EventScript_27374E
 	removeobject VAR_LAST_TALKED
 	return
@@ -42,11 +42,11 @@ AquaHideout_B1F_EventScript_2339EB:: @ 82339EB
 	dowildbattle
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	specialvar VAR_RESULT, sub_8138B80
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq AquaHideout_B1F_EventScript_233A2F
-	compare_var_to_value VAR_RESULT, 4
+	compare VAR_RESULT, 4
 	goto_eq AquaHideout_B1F_EventScript_233A2F
-	compare_var_to_value VAR_RESULT, 5
+	compare VAR_RESULT, 5
 	goto_eq AquaHideout_B1F_EventScript_233A2F
 	setflag FLAG_0x1C4
 	release
@@ -69,11 +69,11 @@ AquaHideout_B1F_EventScript_233A38:: @ 8233A38
 	dowildbattle
 	clearflag FLAG_SYS_CTRL_OBJ_DELETE
 	specialvar VAR_RESULT, sub_8138B80
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq AquaHideout_B1F_EventScript_233A7C
-	compare_var_to_value VAR_RESULT, 4
+	compare VAR_RESULT, 4
 	goto_eq AquaHideout_B1F_EventScript_233A7C
-	compare_var_to_value VAR_RESULT, 5
+	compare VAR_RESULT, 5
 	goto_eq AquaHideout_B1F_EventScript_233A7C
 	setflag FLAG_0x1C5
 	release

data/scripts/maps/BattleFrontier_BattleArenaBattleRoom.inc

@@ -17,9 +17,9 @@ BattleFrontier_BattleArenaBattleRoom_MapScript1_2574A0: @ 82574A0
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_2574AE:: @ 82574AE
 	checkplayergender
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574C6
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2574CC
 	return
 
@@ -43,7 +43,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2574DC:: @ 82574DC
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, 2
 	special sub_81A1780
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25752E
 	applymovement 5, BattleFrontier_BattleArenaBattleRoom_Movement_257C08
 	applymovement 8, BattleFrontier_BattleArenaBattleRoom_Movement_257BEB
@@ -143,31 +143,31 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257630:: @ 8257630
 	special sub_81A1780
 	playfanfare BGM_ME_ASA
 	waitfanfare
-	special sp000_heal_pokemon
+	special HealPlayerParty
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_2576B0:: @ 82576B0
 	setvar VAR_0x8004, 9
 	special sub_81A1780
 	copyvar VAR_0x400F, VAR_RESULT
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, 2
 	special sub_81A1780
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257870
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
 	call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257877
-	compare_var_to_value VAR_RESULT, 3
+	compare VAR_RESULT, 3
 	call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25787E
-	compare_var_to_value VAR_RESULT, 4
+	compare VAR_RESULT, 4
 	call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257885
-	compare_var_to_value VAR_RESULT, 5
+	compare VAR_RESULT, 5
 	call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_25788C
-	compare_var_to_value VAR_RESULT, 6
+	compare VAR_RESULT, 6
 	call_if 1, BattleFrontier_BattleArenaBattleRoom_EventScript_257893
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257768
 	multichoice 19, 4, 103, 1
 	switch VAR_RESULT
@@ -275,7 +275,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_25789A:: @ 825789A
 	end
 
 BattleFrontier_BattleArenaBattleRoom_EventScript_2578BC:: @ 82578BC
-	compare_var_to_value VAR_0x4002, 1
+	compare VAR_0x4002, 1
 	goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_257F45, 4
 	setvar VAR_0x4002, 1
@@ -284,7 +284,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_2578D4:: @ 82578D4
 	message BattleFrontier_BattleArenaBattleRoom_Text_257FBB
 	waitmessage
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_23E8E0
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_25792B
 	multichoice 19, 4, 103, 1
 	switch VAR_RESULT
@@ -333,7 +333,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257961:: @ 8257961
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, 7
 	special sub_81A1780
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_25801C, 4
 	closemessage
@@ -351,7 +351,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257961:: @ 8257961
 BattleFrontier_BattleArenaBattleRoom_EventScript_257A3F:: @ 8257A3F
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_25810D, 4
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_257B5E
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C
 	goto BattleFrontier_BattleArenaBattleRoom_EventScript_2575DB
 
@@ -359,7 +359,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257A5C:: @ 8257A5C
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9
 	setvar VAR_0x8004, 12
 	special sub_81A1780
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257852
 	applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1
 	waitmovement 0
@@ -377,7 +377,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5:: @ 8257AA5
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, 7
 	special sub_81A1780
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_if 5, BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_258213, 4
 	closemessage
@@ -395,7 +395,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257AA5:: @ 8257AA5
 BattleFrontier_BattleArenaBattleRoom_EventScript_257AF8:: @ 8257AF8
 	msgbox BattleFrontier_BattleArenaBattleRoom_Text_2582F9, 4
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_257B5E
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257B15
 	goto BattleFrontier_BattleArenaBattleRoom_EventScript_2575DB
 
@@ -403,7 +403,7 @@ BattleFrontier_BattleArenaBattleRoom_EventScript_257B15:: @ 8257B15
 	call BattleFrontier_BattleArenaBattleRoom_EventScript_257BA9
 	setvar VAR_0x8004, 12
 	special sub_81A1780
-	compare_var_to_value VAR_RESULT, 2
+	compare VAR_RESULT, 2
 	goto_eq BattleFrontier_BattleArenaBattleRoom_EventScript_257852
 	applymovement 7, BattleFrontier_BattleArenaBattleRoom_Movement_257BF1
 	waitmovement 0
@@ -430,14 +430,14 @@ FallarborTown_BattleTentBattleRoom_EventScript_257B6C:: @ 8257B6C
 	setvar VAR_0x8005, 6
 	setvar VAR_0x8006, 0
 	special sub_81A1780
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	setvar VAR_0x8004, 5
 	setvar VAR_0x8005, 0
 	special sub_8163AC4
 	waitstate
 	setvar VAR_0x8004, 18
 	special sub_81A1780
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	setvar VAR_0x8004, 21
 	special sub_81A1780
 	return

data/scripts/maps/BattleFrontier_BattleArenaLobby.inc

@@ -49,7 +49,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255CCF:: @ 8255CCF
 	lockall
 	setvar VAR_0x8004, 10
 	special sub_81A1780
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq BattleFrontier_BattleArenaLobby_EventScript_255CF0
 	msgbox BattleFrontier_BattleArenaLobby_Text_2568E7, 4
 	goto BattleFrontier_BattleArenaLobby_EventScript_255CF8
@@ -90,14 +90,14 @@ BattleFrontier_BattleArenaLobby_EventScript_255D59:: @ 8255D59
 	setvar VAR_0x8004, 8
 	special sub_81A1780
 	special copy_player_party_from_sav1
-	special sp000_heal_pokemon
+	special HealPlayerParty
 	setvar VAR_0x8004, 3
 	setvar VAR_0x8005, 0
 	special sub_81A5238
 	playse SE_SAVE
 	waitse
 	call BattleFrontier_BattleArenaLobby_EventScript_23E8E0
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	goto_eq BattleFrontier_BattleArenaLobby_EventScript_255DBF
 	message BattleFrontier_BattleArenaLobby_Text_256B19
 	waitmessage
@@ -156,7 +156,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255E47:: @ 8255E47
 	case 127, BattleFrontier_BattleArenaLobby_EventScript_255FFB
 	setvar VAR_0x8004, 15
 	special sub_81A1780
-	compare_var_to_value VAR_0x8004, 1
+	compare VAR_0x8004, 1
 	goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FAC
 	setvar VAR_0x8004, 2
 	setvar VAR_0x8005, 1
@@ -169,7 +169,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255E47:: @ 8255E47
 	setvar VAR_0x8005, 3
 	special sub_80F9490
 	waitstate
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FF8
 	msgbox BattleFrontier_BattleArenaLobby_Text_2564CE, 5
 	switch VAR_RESULT
@@ -201,7 +201,7 @@ BattleFrontier_BattleArenaLobby_EventScript_255EE8:: @ 8255EE8
 	delay 2
 	call BattleFrontier_BattleArenaLobby_EventScript_27134F
 	setvar VAR_0x4000, 255
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	goto_eq BattleFrontier_BattleArenaLobby_EventScript_255FE1
 
 BattleFrontier_BattleArenaLobby_EventScript_255F54:: @ 8255F54
@@ -214,9 +214,9 @@ BattleFrontier_BattleArenaLobby_EventScript_255F54:: @ 8255F54
 	setvar VAR_0x8004, 1
 	setvar VAR_0x8005, 1
 	special sub_81A1780
-	compare_var_to_value VAR_RESULT, 0
+	compare VAR_RESULT, 0
 	call_if 1, BattleFrontier_BattleArenaLobby_EventScript_256005
-	compare_var_to_value VAR_RESULT, 1
+	compare VAR_RESULT, 1
 	call_if 1, BattleFrontier_BattleArenaLobby_EventScript_256050
 	warp BATTLE_FRONTIER_BATTLE_ARENA_CORRIDOR, 255, 9, 13
 	setvar VAR_0x4000, 0