fix battle transition conflicts

.gitignore

@@ -15,6 +15,7 @@
 *.latfont
 *.hwjpnfont
 *.fwjpnfont
+sound/**/*.bin
 tools/agbcc
 *.map
 *.ld

Makefile

@@ -32,6 +32,8 @@ OBJCOPY := $(DEVKITARM)/bin/arm-none-eabi-objcopy
 
 LIBGCC := tools/agbcc/lib/libgcc.a
 
+LIBC := tools/agbcc/lib/libc.a
+
 SHA1 := sha1sum -c
 
 GFX := tools/gbagfx/gbagfx
@@ -47,7 +49,7 @@ RAMSCRGEN := tools/ramscrgen/ramscrgen
 # Secondary expansion is required for dependency variables in object rules.
 .SECONDEXPANSION:
 
-.PRECIOUS: %.1bpp %.4bpp %.8bpp %.gbapal %.lz %.rl
+.PRECIOUS: %.1bpp %.4bpp %.8bpp %.gbapal %.lz %.rl %.pcm %.bin sound/direct_sound_samples/cry_%.bin
 
 .PHONY: rom clean compare tidy
 
@@ -75,6 +77,8 @@ compare: $(ROM)
 	@$(SHA1) rom.sha1
 
 clean: tidy
+	rm -f sound/direct_sound_samples/*.bin
+	rm -f $(SONG_OBJS)
 	find . \( -iname '*.1bpp' -o -iname '*.4bpp' -o -iname '*.8bpp' -o -iname '*.gbapal' -o -iname '*.lz' -o -iname '*.latfont' -o -iname '*.hwjpnfont' -o -iname '*.fwjpnfont' \) -exec rm {} +
 
 tidy:
@@ -95,6 +99,10 @@ include graphics_file_rules.mk
 %.gbapal: %.png ; $(GFX) $< $@
 %.lz: % ; $(GFX) $< $@
 %.rl: % ; $(GFX) $< $@
+sound/direct_sound_samples/cry_%.bin: sound/direct_sound_samples/cry_%.aif ; $(AIF) $< $@ --compress
+%.bin: %.aif ; $(AIF) $< $@
+sound/songs/%.s: sound/songs/%.mid
+	cd $(@D) && ../../$(MID) $(<F)
 
 $(C_BUILDDIR)/libc.o: CC1 := tools/agbcc/bin/old_agbcc
 $(C_BUILDDIR)/libc.o: CFLAGS := -O2
@@ -154,7 +162,7 @@ $(OBJ_DIR)/ld_script.ld: ld_script.txt $(OBJ_DIR)/sym_bss.ld $(OBJ_DIR)/sym_comm
 	cd $(OBJ_DIR) && sed -f ../../ld_script.sed ../../$< | sed "s#tools/#../../tools/#g" > ld_script.ld
 
 $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS)
-	cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(OBJS_REL) ../../$(LIBGCC)
+	cd $(OBJ_DIR) && $(LD) $(LDFLAGS) -T ld_script.ld -o ../../$@ $(OBJS_REL) ../../$(LIBGCC) ../../$(LIBC)
 
 $(ROM): $(ELF)
 	$(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@

asm/battle_frontier_1.s

@@ -13641,7 +13641,7 @@ sub_8195ED8: @ 8195ED8
 	push {r4,lr}
 	ldr r4, =gMapHeader
 	ldrb r0, [r4, 0x17]
-	bl is_light_level_1_2_3_or_6
+	bl Overworld_MapTypeAllowsTeleportAndFly
 	lsls r0, 24
 	cmp r0, 0
 	beq _08195F30

asm/easy_chat.s

@@ -6075,7 +6075,7 @@ _0811D19C:
 	b _0811D1BC
 	.pool
 _0811D1A8:
-	ldr r0, =gText_CombineTwoWordsOrPhrases
+	ldr r0, =gText_CombineTwoWordsOrPhrases3
 	str r0, [sp, 0xC]
 	b _0811D1BC
 	.pool

asm/field_door.s

@@ -1,754 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_808A400
-sub_808A400: @ 808A400
-	push {lr}
-	adds r2, r0, 0
-	ldrb r0, [r2, 0x3]
-	cmp r0, 0x2
-	bne _0808A420
-	ldrh r1, [r1, 0x2]
-	ldr r0, [r2, 0x4]
-	adds r0, r1
-	ldr r1, =0x06007e00
-	movs r2, 0x80
-	bl CpuFastSet
-	b _0808A42E
-	.pool
-_0808A420:
-	ldrh r1, [r1, 0x2]
-	ldr r0, [r2, 0x4]
-	adds r0, r1
-	ldr r1, =0x06007f00
-	movs r2, 0x40
-	bl CpuFastSet
-_0808A42E:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_808A400
-
-	thumb_func_start door_build_blockdef
-door_build_blockdef: @ 808A438
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	lsls r1, 16
-	lsrs r5, r1, 16
-	movs r4, 0
-	adds r1, r6, 0
-_0808A444:
-	ldrb r0, [r2]
-	lsls r0, 28
-	lsrs r3, r0, 16
-	adds r2, 0x1
-	adds r0, r5, r4
-	orrs r3, r0
-	strh r3, [r1]
-	adds r1, 0x2
-	adds r4, 0x1
-	cmp r4, 0x3
-	ble _0808A444
-	cmp r4, 0x7
-	bgt _0808A472
-	lsls r0, r4, 1
-	adds r1, r0, r6
-_0808A462:
-	ldrb r0, [r2]
-	lsls r3, r0, 12
-	adds r2, 0x1
-	strh r3, [r1]
-	adds r1, 0x2
-	adds r4, 0x1
-	cmp r4, 0x7
-	ble _0808A462
-_0808A472:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	thumb_func_end door_build_blockdef
-
-	thumb_func_start door_patch_tilemap
-door_patch_tilemap: @ 808A478
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	sub sp, 0x30
-	adds r7, r1, 0
-	mov r9, r2
-	adds r5, r3, 0
-	ldrb r0, [r0, 0x3]
-	cmp r0, 0x2
-	bne _0808A4F4
-	add r4, sp, 0x10
-	movs r1, 0xFC
-	lsls r1, 2
-	adds r0, r4, 0
-	adds r2, r5, 0
-	bl door_build_blockdef
-	mov r6, r9
-	subs r6, 0x1
-	adds r0, r7, 0
-	adds r1, r6, 0
-	adds r2, r4, 0
-	bl DrawDoorMetatileAt
-	movs r1, 0xFD
-	lsls r1, 2
-	adds r0, r5, 0x4
-	mov r8, r0
-	adds r0, r4, 0
-	mov r2, r8
-	bl door_build_blockdef
-	adds r0, r7, 0
-	mov r1, r9
-	adds r2, r4, 0
-	bl DrawDoorMetatileAt
-	movs r1, 0xFE
-	lsls r1, 2
-	adds r0, r4, 0
-	adds r2, r5, 0
-	bl door_build_blockdef
-	adds r5, r7, 0x1
-	adds r0, r5, 0
-	adds r1, r6, 0
-	adds r2, r4, 0
-	bl DrawDoorMetatileAt
-	movs r1, 0xFF
-	lsls r1, 2
-	adds r0, r4, 0
-	mov r2, r8
-	bl door_build_blockdef
-	adds r0, r5, 0
-	mov r1, r9
-	adds r2, r4, 0
-	bl DrawDoorMetatileAt
-	b _0808A522
-_0808A4F4:
-	movs r1, 0xFE
-	lsls r1, 2
-	mov r0, sp
-	adds r2, r5, 0
-	bl door_build_blockdef
-	mov r1, r9
-	subs r1, 0x1
-	adds r0, r7, 0
-	mov r2, sp
-	bl DrawDoorMetatileAt
-	movs r1, 0xFF
-	lsls r1, 2
-	adds r2, r5, 0x4
-	mov r0, sp
-	bl door_build_blockdef
-	adds r0, r7, 0
-	mov r1, r9
-	mov r2, sp
-	bl DrawDoorMetatileAt
-_0808A522:
-	add sp, 0x30
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end door_patch_tilemap
-
-	thumb_func_start sub_808A530
-sub_808A530: @ 808A530
-	push {r4-r7,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	adds r6, r2, 0
-	subs r7, r6, 0x1
-	adds r0, r5, 0
-	adds r1, r7, 0
-	bl CurrentMapDrawMetatileAt
-	adds r0, r5, 0
-	adds r1, r6, 0
-	bl CurrentMapDrawMetatileAt
-	ldrb r0, [r4, 0x3]
-	cmp r0, 0x2
-	bne _0808A562
-	adds r4, r5, 0x1
-	adds r0, r4, 0
-	adds r1, r7, 0
-	bl CurrentMapDrawMetatileAt
-	adds r0, r4, 0
-	adds r1, r6, 0
-	bl CurrentMapDrawMetatileAt
-_0808A562:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	thumb_func_end sub_808A530
-
-	thumb_func_start sub_808A568
-sub_808A568: @ 808A568
-	push {r4-r7,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	adds r6, r2, 0
-	adds r7, r3, 0
-	ldrh r1, [r5, 0x2]
-	ldr r0, =0x0000ffff
-	cmp r1, r0
-	bne _0808A5B0
-	adds r0, r4, 0
-	adds r1, r6, 0
-	adds r2, r7, 0
-	bl sub_808A530
-	bl sub_808A964
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808A5E2
-	ldr r0, =gSpecialVar_0x8004
-	ldrh r1, [r0]
-	adds r1, 0x7
-	ldr r0, =gSpecialVar_0x8005
-	ldrh r2, [r0]
-	adds r2, 0x7
-	adds r0, r4, 0
-	bl sub_808A530
-	b _0808A5E2
-	.pool
-_0808A5B0:
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl sub_808A400
-	ldr r3, [r4, 0x8]
-	adds r0, r4, 0
-	adds r1, r6, 0
-	adds r2, r7, 0
-	bl door_patch_tilemap
-	bl sub_808A964
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808A5E2
-	ldr r0, =gSpecialVar_0x8004
-	ldrh r1, [r0]
-	adds r1, 0x7
-	ldr r0, =gSpecialVar_0x8005
-	ldrh r2, [r0]
-	adds r2, 0x7
-	ldr r3, [r4, 0x8]
-	adds r0, r4, 0
-	bl door_patch_tilemap
-_0808A5E2:
-	pop {r4-r7}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_808A568
-
-	thumb_func_start sub_808A5F0
-sub_808A5F0: @ 808A5F0
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	adds r5, r1, 0
-	adds r4, r2, 0
-	movs r1, 0xA
-	ldrsh r0, [r4, r1]
-	cmp r0, 0
-	bne _0808A616
-	movs r2, 0x8
-	ldrsh r1, [r4, r2]
-	lsls r1, 2
-	adds r1, r5, r1
-	movs r0, 0xC
-	ldrsh r2, [r4, r0]
-	movs r0, 0xE
-	ldrsh r3, [r4, r0]
-	adds r0, r6, 0
-	bl sub_808A568
-_0808A616:
-	movs r2, 0xA
-	ldrsh r1, [r4, r2]
-	movs r2, 0x8
-	ldrsh r0, [r4, r2]
-	lsls r0, 2
-	adds r0, r5
-	ldrb r0, [r0]
-	cmp r1, r0
-	bne _0808A644
-	movs r0, 0
-	strh r0, [r4, 0xA]
-	ldrh r0, [r4, 0x8]
-	adds r0, 0x1
-	strh r0, [r4, 0x8]
-	movs r1, 0x8
-	ldrsh r0, [r4, r1]
-	lsls r0, 2
-	adds r0, r5
-	ldrb r0, [r0]
-	cmp r0, 0
-	bne _0808A64A
-	movs r0, 0
-	b _0808A64C
-_0808A644:
-	ldrh r0, [r4, 0xA]
-	adds r0, 0x1
-	strh r0, [r4, 0xA]
-_0808A64A:
-	movs r0, 0x1
-_0808A64C:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_808A5F0
-
-	thumb_func_start task50_overworld_door
-task50_overworld_door: @ 808A654
-	push {r4,lr}
-	lsls r0, 24
-	lsrs r4, r0, 24
-	lsls r2, r4, 2
-	adds r2, r4
-	lsls r2, 3
-	ldr r0, =gTasks + 0x8
-	adds r2, r0
-	ldrh r1, [r2]
-	lsls r1, 16
-	ldrh r0, [r2, 0x2]
-	orrs r1, r0
-	ldrh r0, [r2, 0x4]
-	lsls r0, 16
-	ldrh r3, [r2, 0x6]
-	orrs r0, r3
-	bl sub_808A5F0
-	cmp r0, 0
-	bne _0808A682
-	adds r0, r4, 0
-	bl DestroyTask
-_0808A682:
-	pop {r4}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end task50_overworld_door
-
-	thumb_func_start door_frame_last
-door_frame_last: @ 808A68C
-	push {lr}
-	adds r1, r0, 0
-	b _0808A694
-_0808A692:
-	adds r1, 0x4
-_0808A694:
-	ldrb r0, [r1]
-	cmp r0, 0
-	bne _0808A692
-	subs r0, r1, 0x4
-	pop {r1}
-	bx r1
-	thumb_func_end door_frame_last
-
-	thumb_func_start door_find
-door_find: @ 808A6A0
-	push {lr}
-	adds r2, r0, 0
-	lsls r1, 16
-	lsrs r1, 16
-	b _0808A6B6
-_0808A6AA:
-	ldrh r0, [r2]
-	cmp r0, r1
-	bne _0808A6B4
-	adds r0, r2, 0
-	b _0808A6BE
-_0808A6B4:
-	adds r2, 0xC
-_0808A6B6:
-	ldr r0, [r2, 0x4]
-	cmp r0, 0
-	bne _0808A6AA
-	movs r0, 0
-_0808A6BE:
-	pop {r1}
-	bx r1
-	thumb_func_end door_find
-
-	thumb_func_start task_overworld_door_add_if_inactive
-task_overworld_door_add_if_inactive: @ 808A6C4
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	adds r6, r0, 0
-	adds r5, r1, 0
-	adds r7, r2, 0
-	mov r8, r3
-	ldr r4, =task50_overworld_door
-	adds r0, r4, 0
-	bl FuncIsActiveTask
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0808A718
-	adds r0, r4, 0
-	movs r1, 0x50
-	bl CreateTask
-	lsls r0, 24
-	lsrs r0, 24
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	ldr r2, =gTasks + 0x8
-	adds r1, r2
-	strh r7, [r1, 0xC]
-	mov r2, r8
-	strh r2, [r1, 0xE]
-	strh r5, [r1, 0x2]
-	lsrs r2, r5, 16
-	strh r2, [r1]
-	strh r6, [r1, 0x6]
-	lsrs r2, r6, 16
-	strh r2, [r1, 0x4]
-	lsls r0, 24
-	asrs r0, 24
-	b _0808A71C
-	.pool
-_0808A718:
-	movs r0, 0x1
-	negs r0, r0
-_0808A71C:
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end task_overworld_door_add_if_inactive
-
-	thumb_func_start sub_808A728
-sub_808A728: @ 808A728
-	push {lr}
-	bl sub_808A530
-	pop {r0}
-	bx r0
-	thumb_func_end sub_808A728
-
-	thumb_func_start sub_808A734
-sub_808A734: @ 808A734
-	push {r4-r6,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	adds r6, r2, 0
-	adds r0, r5, 0
-	adds r1, r6, 0
-	bl MapGridGetMetatileIdAt
-	adds r1, r0, 0
-	lsls r1, 16
-	lsrs r1, 16
-	adds r0, r4, 0
-	bl door_find
-	adds r4, r0, 0
-	cmp r4, 0
-	beq _0808A76A
-	ldr r1, =gUnknown_08496F8C
-	adds r0, r1, 0
-	bl door_frame_last
-	adds r1, r0, 0
-	adds r0, r4, 0
-	adds r2, r5, 0
-	adds r3, r6, 0
-	bl sub_808A568
-_0808A76A:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_808A734
-
-	thumb_func_start task_overworld_door_add_for_opening_door_at
-@ s32 task_overworld_door_add_for_opening_door_at(void *a1, s32 x, s32 y)
-task_overworld_door_add_for_opening_door_at: @ 808A774
-	push {r4-r6,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	adds r6, r2, 0
-	adds r0, r5, 0
-	adds r1, r6, 0
-	bl MapGridGetMetatileIdAt
-	adds r1, r0, 0
-	lsls r1, 16
-	lsrs r1, 16
-	adds r0, r4, 0
-	bl door_find
-	adds r2, r0, 0
-	adds r4, r2, 0
-	cmp r2, 0
-	bne _0808A79E
-	movs r0, 0x1
-	negs r0, r0
-	b _0808A7C0
-_0808A79E:
-	ldrb r0, [r2, 0x3]
-	cmp r0, 0x2
-	beq _0808A7B0
-	ldr r1, =gUnknown_08496F8C
-	adds r0, r2, 0
-	b _0808A7B4
-	.pool
-_0808A7B0:
-	ldr r1, =gUnknown_08496FB4
-	adds r0, r4, 0
-_0808A7B4:
-	adds r2, r5, 0
-	adds r3, r6, 0
-	bl task_overworld_door_add_if_inactive
-	lsls r0, 24
-	asrs r0, 24
-_0808A7C0:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end task_overworld_door_add_for_opening_door_at
-
-	thumb_func_start sub_808A7CC
-sub_808A7CC: @ 808A7CC
-	push {r4-r6,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	adds r6, r2, 0
-	adds r0, r5, 0
-	adds r1, r6, 0
-	bl MapGridGetMetatileIdAt
-	adds r1, r0, 0
-	lsls r1, 16
-	lsrs r1, 16
-	adds r0, r4, 0
-	bl door_find
-	cmp r0, 0
-	beq _0808A800
-	ldr r1, =gUnknown_08496FA0
-	adds r2, r5, 0
-	adds r3, r6, 0
-	bl task_overworld_door_add_if_inactive
-	lsls r0, 24
-	asrs r0, 24
-	b _0808A804
-	.pool
-_0808A800:
-	movs r0, 0x1
-	negs r0, r0
-_0808A804:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_808A7CC
-
-	thumb_func_start cur_mapdata_get_door_x2_at
-cur_mapdata_get_door_x2_at: @ 808A80C
-	push {r4,lr}
-	adds r4, r0, 0
-	adds r0, r1, 0
-	adds r1, r2, 0
-	bl MapGridGetMetatileIdAt
-	adds r1, r0, 0
-	lsls r1, 16
-	lsrs r1, 16
-	adds r0, r4, 0
-	bl door_find
-	cmp r0, 0
-	beq _0808A830
-	ldrb r0, [r0, 0x2]
-	lsls r0, 24
-	asrs r0, 24
-	b _0808A834
-_0808A830:
-	movs r0, 0x1
-	negs r0, r0
-_0808A834:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end cur_mapdata_get_door_x2_at
-
-	thumb_func_start sub_808A83C
-sub_808A83C: @ 808A83C
-	push {lr}
-	adds r3, r0, 0
-	adds r2, r1, 0
-	ldr r0, =gUnknown_08497174
-	adds r1, r3, 0
-	bl task_overworld_door_add_for_opening_door_at
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_808A83C
-
-	thumb_func_start FieldSetDoorOpened
-FieldSetDoorOpened: @ 808A854
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r0, 24
-	bl MetatileBehavior_IsDoor
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808A876
-	ldr r0, =gUnknown_08497174
-	adds r1, r4, 0
-	adds r2, r5, 0
-	bl sub_808A734
-_0808A876:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end FieldSetDoorOpened
-
-	thumb_func_start FieldSetDoorClosed
-FieldSetDoorClosed: @ 808A880
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r0, 24
-	bl MetatileBehavior_IsDoor
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808A8A2
-	ldr r0, =gUnknown_08497174
-	adds r1, r4, 0
-	adds r2, r5, 0
-	bl sub_808A728
-_0808A8A2:
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end FieldSetDoorClosed
-
-	thumb_func_start FieldAnimateDoorClose
-FieldAnimateDoorClose: @ 808A8AC
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r0, 24
-	bl MetatileBehavior_IsDoor
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808A8D8
-	ldr r0, =gUnknown_08497174
-	adds r1, r4, 0
-	adds r2, r5, 0
-	bl sub_808A7CC
-	lsls r0, 24
-	asrs r0, 24
-	b _0808A8DC
-	.pool
-_0808A8D8:
-	movs r0, 0x1
-	negs r0, r0
-_0808A8DC:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end FieldAnimateDoorClose
-
-	thumb_func_start FieldAnimateDoorOpen
-FieldAnimateDoorOpen: @ 808A8E4
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	bl MapGridGetMetatileBehaviorAt
-	lsls r0, 24
-	lsrs r0, 24
-	bl MetatileBehavior_IsDoor
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808A910
-	ldr r0, =gUnknown_08497174
-	adds r1, r4, 0
-	adds r2, r5, 0
-	bl task_overworld_door_add_for_opening_door_at
-	lsls r0, 24
-	asrs r0, 24
-	b _0808A914
-	.pool
-_0808A910:
-	movs r0, 0x1
-	negs r0, r0
-_0808A914:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end FieldAnimateDoorOpen
-
-	thumb_func_start FieldIsDoorAnimationRunning
-FieldIsDoorAnimationRunning: @ 808A91C
-	push {lr}
-	ldr r0, =task50_overworld_door
-	bl FuncIsActiveTask
-	lsls r0, 24
-	lsrs r0, 24
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end FieldIsDoorAnimationRunning
-
-	thumb_func_start GetDoorSoundEffect
-GetDoorSoundEffect: @ 808A930
-	push {lr}
-	adds r3, r0, 0
-	adds r2, r1, 0
-	ldr r0, =gUnknown_08497174
-	adds r1, r3, 0
-	bl cur_mapdata_get_door_x2_at
-	lsls r0, 24
-	asrs r0, 24
-	cmp r0, 0
-	beq _0808A958
-	cmp r0, 0x1
-	bne _0808A954
-	movs r0, 0x12
-	b _0808A95E
-	.pool
-_0808A954:
-	cmp r0, 0x2
-	beq _0808A95C
-_0808A958:
-	movs r0, 0x8
-	b _0808A95E
-_0808A95C:
-	movs r0, 0x2F
-_0808A95E:
-	pop {r1}
-	bx r1
-	thumb_func_end GetDoorSoundEffect
-
-	thumb_func_start sub_808A964
-sub_808A964: @ 808A964
-	push {lr}
-	ldr r0, =0x00004002
-	bl FlagGet
-	lsls r0, 24
-	cmp r0, 0
-	beq _0808A990
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	ldrh r1, [r0, 0x4]
-	ldr r0, =0x0000101a
-	cmp r1, r0
-	bne _0808A990
-	movs r0, 0x1
-	b _0808A992
-	.pool
-_0808A990:
-	movs r0, 0
-_0808A992:
-	pop {r1}
-	bx r1
-	thumb_func_end sub_808A964
-
-	.align 2, 0 @ Don't pad with nop.

asm/fldeff_80F9BCC.s

@@ -591,7 +591,7 @@ sub_80FA004: @ 80FA004
 	bne _080FA070
 	bl sub_80F9F5C
 	ldr r1, =gUnknown_03005DB0
-	ldr r0, =hm_add_c3_launch_phase_2
+	ldr r0, =FieldCallback_Teleport
 	str r0, [r1]
 	ldr r1, =gUnknown_0203CEEC
 	ldr r0, =sub_80FA0DC
@@ -606,7 +606,7 @@ _080FA070:
 	bne _080FA0A0
 	bl sub_80F9F5C
 	ldr r1, =gUnknown_03005DB0
-	ldr r0, =hm_add_c3_launch_phase_2
+	ldr r0, =FieldCallback_Teleport
 	str r0, [r1]
 	ldr r1, =gUnknown_0203CEEC
 	ldr r0, =sub_80FA1E8
@@ -625,7 +625,7 @@ _080FA0AE:
 _080FA0B2:
 	bl sub_80F9F5C
 	ldr r1, =gUnknown_03005DB0
-	ldr r0, =hm_add_c3_launch_phase_2
+	ldr r0, =FieldCallback_Teleport
 	str r0, [r1]
 	ldr r1, =gUnknown_0203CEEC
 	ldr r0, =sub_80FA34C

asm/fldeff_cut.s

@@ -20,7 +20,7 @@ sub_80D3718: @ 80D3718
 	cmp r0, 0x1
 	bne _080D3754
 	ldr r1, =gUnknown_03005DB0
-	ldr r0, =hm_add_c3_launch_phase_2
+	ldr r0, =FieldCallback_Teleport
 	str r0, [r1]
 	ldr r1, =gUnknown_0203CEEC
 	ldr r0, =sub_80D3A9C
@@ -322,7 +322,7 @@ _080D395A:
 	bne _080D39F8
 _080D39BC:
 	ldr r1, =gUnknown_03005DB0
-	ldr r0, =hm_add_c3_launch_phase_2
+	ldr r0, =FieldCallback_Teleport
 	str r0, [r1]
 	ldr r1, =gUnknown_0203CEEC
 	ldr r0, =hm2_ruin_valley
@@ -360,7 +360,7 @@ _080D3A18:
 	bne _080D3A2A
 _080D3A1E:
 	ldr r1, =gUnknown_03005DB0
-	ldr r0, =hm_add_c3_launch_phase_2
+	ldr r0, =FieldCallback_Teleport
 	str r0, [r1]
 	ldr r1, =gUnknown_0203CEEC
 	ldr r0, =hm2_ruin_valley

asm/fldeff_flash.s

@@ -18,7 +18,7 @@ SetUpFieldMove_Flash: @ 81370FC
 	lsrs r0, 24
 	strh r0, [r4]
 	ldr r1, =gUnknown_03005DB0
-	ldr r0, =hm_add_c3_launch_phase_2
+	ldr r0, =FieldCallback_Teleport
 	str r0, [r1]
 	ldr r1, =gUnknown_0203CEEC
 	ldr r0, =sub_8179918
@@ -35,7 +35,7 @@ _08137134:
 	cmp r0, 0
 	bne _08137170
 	ldr r1, =gUnknown_03005DB0
-	ldr r0, =hm_add_c3_launch_phase_2
+	ldr r0, =FieldCallback_Teleport
 	str r0, [r1]
 	ldr r1, =gUnknown_0203CEEC
 	ldr r0, =hm2_flash

asm/fldeff_strength.s

@@ -23,7 +23,7 @@ _08145DD8:
 	lsrs r0, 24
 	strh r0, [r4]
 	ldr r1, =gUnknown_03005DB0
-	ldr r0, =hm_add_c3_launch_phase_2
+	ldr r0, =FieldCallback_Teleport
 	str r0, [r1]
 	ldr r1, =gUnknown_0203CEEC
 	ldr r0, =sub_8145E0C

asm/fldeff_sweetscent.s

@@ -8,7 +8,7 @@
 	thumb_func_start SetUpFieldMove_SweetScent
 SetUpFieldMove_SweetScent: @ 8159EF0
 	ldr r1, =gUnknown_03005DB0
-	ldr r0, =hm_add_c3_launch_phase_2
+	ldr r0, =FieldCallback_Teleport
 	str r0, [r1]
 	ldr r1, =gUnknown_0203CEEC
 	ldr r0, =hm2_sweet_scent

asm/fldeff_teleport.s

@@ -1,84 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start SetUpFieldMove_Teleport
-SetUpFieldMove_Teleport: @ 817C8BC
-	push {lr}
-	ldr r0, =gMapHeader
-	ldrb r0, [r0, 0x17]
-	bl is_light_level_1_2_3_or_6
-	lsls r0, 24
-	lsrs r0, 24
-	cmp r0, 0x1
-	beq _0817C8D8
-	movs r0, 0
-	b _0817C8E6
-	.pool
-_0817C8D8:
-	ldr r1, =gUnknown_03005DB0
-	ldr r0, =hm_add_c3_launch_phase_2
-	str r0, [r1]
-	ldr r1, =gUnknown_0203CEEC
-	ldr r0, =hm_teleport_run_dp02scr
-	str r0, [r1]
-	movs r0, 0x1
-_0817C8E6:
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end SetUpFieldMove_Teleport
-
-	thumb_func_start hm_teleport_run_dp02scr
-hm_teleport_run_dp02scr: @ 817C8FC
-	push {lr}
-	bl sub_808469C
-	movs r0, 0x3F
-	bl FieldEffectStart
-	bl GetCursorSelectionMonId
-	ldr r1, =gFieldEffectArguments
-	lsls r0, 24
-	lsrs r0, 24
-	str r0, [r1]
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end hm_teleport_run_dp02scr
-
-	thumb_func_start FldEff_UseTeleport
-FldEff_UseTeleport: @ 817C91C
-	push {lr}
-	bl oei_task_add
-	lsls r0, 24
-	lsrs r0, 24
-	ldr r2, =gTasks
-	lsls r1, r0, 2
-	adds r1, r0
-	lsls r1, 3
-	adds r1, r2
-	ldr r2, =sub_817C94C
-	lsrs r0, r2, 16
-	strh r0, [r1, 0x18]
-	strh r2, [r1, 0x1A]
-	movs r0, 0x1
-	bl SetPlayerAvatarTransitionFlags
-	movs r0, 0
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end FldEff_UseTeleport
-
-	thumb_func_start sub_817C94C
-sub_817C94C: @ 817C94C
-	push {lr}
-	movs r0, 0x3F
-	bl FieldEffectActiveListRemove
-	bl sub_80B7FC8
-	pop {r0}
-	bx r0
-	thumb_func_end sub_817C94C
-
-	.align 2, 0 @ Don't pad with nop.

asm/macros.inc

@@ -119,3 +119,17 @@
 	.2byte \unknown
 	.fill 4 @ padding
 	.endm
+
+	.macro door_anim_frame unknown, offset
+	.byte \unknown
+	.byte 0 @ padding
+	.2byte \offset
+	.endm
+
+	.macro door_anim_gfx metatile_num, unknown, unknown2, tile_addr, palette_addr
+	.2byte \metatile_num
+	.byte \unknown
+	.byte \unknown2
+	.4byte \tile_addr
+	.4byte \palette_addr
+	.endm

asm/macros/music_voice.inc

@@ -0,0 +1,125 @@
+	.macro voice_directsound base_midi_key, pan, sample_data_pointer, attack, decay, sustain, release
+	.byte 0
+	_voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release
+	.endm
+
+	.macro voice_directsound_no_resample base_midi_key, pan, sample_data_pointer, attack, decay, sustain, release
+	.byte 8
+	_voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release
+	.endm
+
+	.macro voice_directsound_alt base_midi_key, pan, sample_data_pointer, attack, decay, sustain, release
+	.byte 16
+	_voice_directsound \base_midi_key, \pan, \sample_data_pointer, \attack, \decay, \sustain, \release
+	.endm
+
+	.macro _voice_directsound base_midi_key, pan, sample_data_pointer, attack, decay, sustain, release
+	.byte \base_midi_key
+	.byte 0
+	.if \pan != 0
+	.byte (0x80 | \pan)
+	.else
+	.byte 0
+	.endif
+	.4byte \sample_data_pointer
+	.byte \attack
+	.byte \decay
+	.byte \sustain
+	.byte \release
+	.endm
+
+	.macro voice_square_1 sweep, duty_cycle, attack, decay, sustain, release
+	_voice_square_1 1, \sweep, \duty_cycle, \attack, \decay, \sustain, \release
+	.endm
+
+	.macro voice_square_1_alt sweep, duty_cycle, attack, decay, sustain, release
+	_voice_square_1 9, \sweep, \duty_cycle, \attack, \decay, \sustain, \release
+	.endm
+
+	.macro _voice_square_1 type, sweep, duty_cycle, attack, decay, sustain, release
+	.byte \type, 60, 0
+	.byte \sweep
+	.byte (\duty_cycle & 0x3)
+	.byte 0, 0, 0
+	.byte (\attack  & 0x7)
+	.byte (\decay   & 0x7)
+	.byte (\sustain & 0xF)
+	.byte (\release & 0x7)
+	.endm
+
+	.macro voice_square_2 duty_cycle, attack, decay, sustain, release
+	_voice_square_2 2, \duty_cycle, \attack, \decay, \sustain, \release
+	.endm
+
+	.macro voice_square_2_alt duty_cycle, attack, decay, sustain, release
+	_voice_square_2 10, \duty_cycle, \attack, \decay, \sustain, \release
+	.endm
+
+	.macro _voice_square_2 type, duty_cycle, attack, decay, sustain, release
+	.byte \type, 60, 0, 0
+	.byte (\duty_cycle & 0x3)
+	.byte 0, 0, 0
+	.byte (\attack  & 0x7)
+	.byte (\decay   & 0x7)
+	.byte (\sustain & 0xF)
+	.byte (\release & 0x7)
+	.endm
+
+	.macro voice_programmable_wave wave_samples_pointer, attack, decay, sustain, release
+	_voice_programmable_wave 3, \wave_samples_pointer, \attack, \decay, \sustain, \release
+	.endm
+
+	.macro voice_programmable_wave_alt wave_samples_pointer, attack, decay, sustain, release
+	_voice_programmable_wave 11, \wave_samples_pointer, \attack, \decay, \sustain, \release
+	.endm
+
+	.macro _voice_programmable_wave type, wave_samples_pointer, attack, decay, sustain, release
+	.byte \type, 60, 0, 0
+	.4byte \wave_samples_pointer
+	.byte (\attack  & 0x7)
+	.byte (\decay   & 0x7)
+	.byte (\sustain & 0xF)
+	.byte (\release & 0x7)
+	.endm
+
+	.macro voice_noise period, attack, decay, sustain, release
+	_voice_noise 4, \period, \attack, \decay, \sustain, \release
+	.endm
+
+	.macro voice_noise_alt period, attack, decay, sustain, release
+	_voice_noise 12, \period, \attack, \decay, \sustain, \release
+	.endm
+
+	.macro _voice_noise type, period, attack, decay, sustain, release
+	.byte \type, 60, 0, 0
+	.byte (\period & 0x1)
+	.byte 0, 0, 0
+	.byte (\attack  & 0x7)
+	.byte (\decay   & 0x7)
+	.byte (\sustain & 0xF)
+	.byte (\release & 0x7)
+	.endm
+
+	.macro voice_keysplit voice_group_pointer, keysplit_table_pointer
+	.byte 0x40, 0, 0, 0
+	.4byte \voice_group_pointer
+	.4byte \keysplit_table_pointer
+	.endm
+
+	.macro voice_keysplit_all voice_group_pointer
+	.byte 0x80, 0, 0, 0
+	.4byte \voice_group_pointer
+	.4byte 0
+	.endm
+
+	.macro cry sample
+	.byte 0x20, 60, 0, 0
+	.4byte \sample
+	.byte 0xff, 0, 0xff, 0
+	.endm
+
+	.macro cry2 sample
+	.byte 0x30, 60, 0, 0
+	.4byte \sample
+	.byte 0xff, 0, 0xff, 0
+	.endm

asm/overworld.s

@@ -50,8 +50,8 @@ flag_var_implications_of_teleport_: @ 8084660
 	.pool
 	thumb_func_end flag_var_implications_of_teleport_
 
-	thumb_func_start sub_808469C
-sub_808469C: @ 808469C
+	thumb_func_start Overworld_ResetStateAfterTeleport
+Overworld_ResetStateAfterTeleport: @ 808469C
 	push {lr}
 	bl player_avatar_init_params_reset
 	ldr r0, =0x0000088b
@@ -69,7 +69,7 @@ sub_808469C: @ 808469C
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_808469C
+	thumb_func_end Overworld_ResetStateAfterTeleport
 
 	thumb_func_start flagmods_08054D70
 flagmods_08054D70: @ 80846E4
@@ -2772,8 +2772,8 @@ _08085BF0:
 	bx r1
 	thumb_func_end is_light_level_1_2_3_5_or_6
 
-	thumb_func_start is_light_level_1_2_3_or_6
-is_light_level_1_2_3_or_6: @ 8085BF4
+	thumb_func_start Overworld_MapTypeAllowsTeleportAndFly
+Overworld_MapTypeAllowsTeleportAndFly: @ 8085BF4
 	push {lr}
 	lsls r0, 24
 	lsrs r0, 24
@@ -2793,7 +2793,7 @@ _08085C0E:
 _08085C10:
 	pop {r1}
 	bx r1
-	thumb_func_end is_light_level_1_2_3_or_6
+	thumb_func_end Overworld_MapTypeAllowsTeleportAndFly
 
 	thumb_func_start is_light_level_8_or_9
 is_light_level_8_or_9: @ 8085C14

asm/party_menu.s

@@ -10027,8 +10027,8 @@ _081B572A:
 	.pool
 	thumb_func_end sub_81B56D8
 
-	thumb_func_start hm_add_c3_launch_phase_2
-hm_add_c3_launch_phase_2: @ 81B5738
+	thumb_func_start FieldCallback_Teleport
+FieldCallback_Teleport: @ 81B5738
 	push {lr}
 	bl pal_fill_black
 	ldr r0, =task_launch_hm_phase_2
@@ -10038,7 +10038,7 @@ hm_add_c3_launch_phase_2: @ 81B5738
 	pop {r1}
 	bx r1
 	.pool
-	thumb_func_end hm_add_c3_launch_phase_2
+	thumb_func_end FieldCallback_Teleport
 
 	thumb_func_start task_launch_hm_phase_2
 task_launch_hm_phase_2: @ 81B5750
@@ -10160,7 +10160,7 @@ sub_81B5820: @ 81B5820
 	cmp r0, 0x1
 	bne _081B585C
 	ldr r1, =gUnknown_03005DB0
-	ldr r0, =hm_add_c3_launch_phase_2
+	ldr r0, =FieldCallback_Teleport
 	str r0, [r1]
 	ldr r1, =gUnknown_0203CEEC
 	ldr r0, =hm_surf_run_dp02scr
@@ -10199,7 +10199,7 @@ sub_81B5884: @ 81B5884
 	push {lr}
 	ldr r0, =gMapHeader
 	ldrb r0, [r0, 0x17]
-	bl is_light_level_1_2_3_or_6
+	bl Overworld_MapTypeAllowsTeleportAndFly
 	lsls r0, 24
 	lsrs r0, 24
 	cmp r0, 0x1
@@ -10278,7 +10278,7 @@ hm_prepare_waterfall: @ 81B58F0
 	cmp r0, 0x1
 	bne _081B594C
 	ldr r1, =gUnknown_03005DB0
-	ldr r0, =hm_add_c3_launch_phase_2
+	ldr r0, =FieldCallback_Teleport
 	str r0, [r1]
 	ldr r1, =gUnknown_0203CEEC
 	ldr r0, =hm2_waterfall
@@ -10325,7 +10325,7 @@ sub_81B5974: @ 81B5974
 	.pool
 _081B5990:
 	ldr r1, =gUnknown_03005DB0
-	ldr r0, =hm_add_c3_launch_phase_2
+	ldr r0, =FieldCallback_Teleport
 	str r0, [r1]
 	ldr r1, =gUnknown_0203CEEC
 	ldr r0, =sub_81B5958

asm/pokemon_animation.s

@@ -333,7 +333,7 @@ sub_817F670: @ 817F670
 	movs r1, 0x3
 	orrs r0, r1
 	strb r0, [r4, 0x1]
-	ldr r0, =gUnknown_0860AD68
+	ldr r0, =gSpriteAffineAnimTable_860AD68
 	str r0, [r4, 0x10]
 	ldr r0, =gUnknown_03001274
 	ldr r0, [r0]

asm/pokenav.s

@@ -7924,7 +7924,7 @@ sub_81CAF78: @ 81CAF78
 	strb r0, [r6]
 	ldr r0, =gMapHeader
 	ldrb r0, [r0, 0x17]
-	bl is_light_level_1_2_3_or_6
+	bl Overworld_MapTypeAllowsTeleportAndFly
 	lsls r0, 24
 	cmp r0, 0
 	bne _081CAFA4

asm/rom6.s

@@ -268,7 +268,7 @@ sub_8135654: @ 8135654
 	lsrs r0, 24
 	strh r0, [r4]
 	ldr r1, =gUnknown_03005DB0
-	ldr r0, =hm_add_c3_launch_phase_2
+	ldr r0, =FieldCallback_Teleport
 	str r0, [r1]
 	ldr r1, =gUnknown_0203CEEC
 	ldr r0, =sub_8179834
@@ -285,7 +285,7 @@ _0813568C:
 	b _081356AC
 _0813569E:
 	ldr r1, =gUnknown_03005DB0
-	ldr r0, =hm_add_c3_launch_phase_2
+	ldr r0, =FieldCallback_Teleport
 	str r0, [r1]
 	ldr r1, =gUnknown_0203CEEC
 	ldr r0, =sub_81356C4
@@ -361,7 +361,7 @@ sub_813572C: @ 813572C
 	b _0813574C
 _0813573E:
 	ldr r1, =gUnknown_03005DB0
-	ldr r0, =hm_add_c3_launch_phase_2
+	ldr r0, =FieldCallback_Teleport
 	str r0, [r1]
 	ldr r1, =gUnknown_0203CEEC
 	ldr r0, =hm2_dig

data/battle_anim_8170478.s

@@ -10,33 +10,33 @@ gUnknown_085E5088:: @ 85E5088
 
     .align 2
 gUnknown_085E5094:: @ 85E5094
-	.4byte gBattleAnimSpriteSheet_Particles, 0xd6ec0100
-	.4byte gBattleAnimSpriteSheet_Particles, 0xd6ed0100
-	.4byte gBattleAnimSpriteSheet_Particles, 0xd6ee0100
-	.4byte gBattleAnimSpriteSheet_Particles, 0xd6ef0100
-	.4byte gBattleAnimSpriteSheet_Particles, 0xd6f00100
-	.4byte gBattleAnimSpriteSheet_Particles, 0xd6f10100
-	.4byte gBattleAnimSpriteSheet_Particles, 0xd6f20100
-	.4byte gBattleAnimSpriteSheet_Particles, 0xd6f30100
-	.4byte gBattleAnimSpriteSheet_Particles, 0xd6f40100
-	.4byte gBattleAnimSpriteSheet_Particles, 0xd6f50100
-	.4byte gBattleAnimSpriteSheet_Particles, 0xd6f60100
-	.4byte gBattleAnimSpriteSheet_Particles, 0xd6f70100
+	obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6ec
+	obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6ed
+	obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6ee
+	obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6ef
+	obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6f0
+	obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6f1
+	obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6f2
+	obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6f3
+	obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6f4
+	obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6f5
+	obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6f6
+	obj_tiles gBattleAnimSpriteSheet_Particles, 0x0100, 0xd6f7
 
 	.align 2
 gUnknown_085E50F4:: @ 85E50F4
-	.4byte gBattleAnimSpritePalette_136, 0x0000d6ec
-	.4byte gBattleAnimSpritePalette_136, 0x0000d6ed
-	.4byte gBattleAnimSpritePalette_136, 0x0000d6ee
-	.4byte gBattleAnimSpritePalette_136, 0x0000d6ef
-	.4byte gBattleAnimSpritePalette_136, 0x0000d6f0
-	.4byte gBattleAnimSpritePalette_136, 0x0000d6f1
-	.4byte gBattleAnimSpritePalette_136, 0x0000d6f2
-	.4byte gBattleAnimSpritePalette_136, 0x0000d6f3
-	.4byte gBattleAnimSpritePalette_136, 0x0000d6f4
-	.4byte gBattleAnimSpritePalette_136, 0x0000d6f5
-	.4byte gBattleAnimSpritePalette_136, 0x0000d6f6
-	.4byte gBattleAnimSpritePalette_136, 0x0000d6f7
+	obj_pal gBattleAnimSpritePalette_136, 0xd6ec
+	obj_pal gBattleAnimSpritePalette_136, 0xd6ed
+	obj_pal gBattleAnimSpritePalette_136, 0xd6ee
+	obj_pal gBattleAnimSpritePalette_136, 0xd6ef
+	obj_pal gBattleAnimSpritePalette_136, 0xd6f0
+	obj_pal gBattleAnimSpritePalette_136, 0xd6f1
+	obj_pal gBattleAnimSpritePalette_136, 0xd6f2
+	obj_pal gBattleAnimSpritePalette_136, 0xd6f3
+	obj_pal gBattleAnimSpritePalette_136, 0xd6f4
+	obj_pal gBattleAnimSpritePalette_136, 0xd6f5
+	obj_pal gBattleAnimSpritePalette_136, 0xd6f6
+	obj_pal gBattleAnimSpritePalette_136, 0xd6f7
 
 	.align 2
 gUnknown_085E5154:: @ 85E5154

data/battle_link_817C95C.s

@@ -0,0 +1,174 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+    .align 1
+gUnknown_0860A4AC:: @ 860A4AC
+	.2byte 0x0044, 0x005a, 0x0075, 0x00f3, 0x0020, 0x00af, 0x00b3, 0x00ed, 0x0149, 0x0108, 0x011c, 0x0143, 0x008a, 0x0137, 0x00ad, 0x00dc
+	.2byte 0x000c, 0x00da, 0x00d8, 0x011b, 0x00d9, 0x0117, 0xffff, 0x00de, 0x0095, 0xffff
+
+    .align 1
+gUnknown_0860A4E0:: @ 860A4E0
+	.2byte 0x0001, 0x0001, 0x0001, 0x0004, 0x0001, 0x0001, 0x0001, 0x0000, 0x0005, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001
+	.2byte 0x0001, 0x0002, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0005, 0x0005, 0x0004, 0x0005, 0x0001, 0x0003, 0x0001
+	.2byte 0x0003, 0x0005, 0x0001, 0x0007, 0x0001, 0x0007, 0x0007, 0x0001, 0x0005, 0x0002, 0x0004, 0x0001, 0x0001, 0x0001, 0x0005, 0x0001
+	.2byte 0x0002, 0x0004, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0000, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001
+	.2byte 0x0001, 0x0007, 0x0004, 0x0004, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0004, 0x0001, 0x0001, 0x0001, 0x0004
+	.2byte 0x0005, 0x0002, 0x0004, 0x0001, 0x0004, 0x0001, 0x0007, 0x0002, 0x0001, 0x0005, 0x0007, 0x0003, 0x0003, 0x0004, 0x0003, 0x0003
+	.2byte 0x0003, 0x0003, 0x0003, 0x0002, 0x0004, 0x0001, 0x0005, 0x0001, 0x0001, 0x0004, 0x0005, 0x0003, 0x0001, 0x0002, 0x0001, 0x0005
+	.2byte 0x0004, 0x0003, 0x0006, 0x0004, 0x0003, 0x0003, 0x0003, 0x0002, 0x0004, 0x0001, 0x0001, 0x0001, 0x0005, 0x0001, 0x0001, 0x0007
+	.2byte 0x0002, 0x0002, 0x0001, 0x0001, 0x0004, 0x0004, 0x0004, 0x0001, 0x0004, 0x0004, 0x0001, 0x0001, 0x0001, 0x0001, 0x0007, 0x0007
+	.2byte 0x0006, 0x0003, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0001, 0x0002, 0x0003, 0x0001, 0x0001, 0x0004, 0x0004
+	.2byte 0x0003, 0x0003, 0x0003, 0x0001, 0x0004, 0x0007, 0x0007, 0x0005, 0x0007, 0x0001, 0x0007, 0x0001, 0x0005, 0x0000, 0x0004, 0x0004
+	.2byte 0x0004, 0x0004, 0x0004, 0x0002, 0x0002, 0x0006, 0x0003, 0x0006, 0x0004, 0x0004, 0x0002, 0x0005, 0x0002, 0x0001, 0x0001, 0x0006
+	.2byte 0x0006, 0x0006, 0x0001, 0x0001, 0x0001, 0x0001, 0x0002, 0x0006, 0x0001, 0x0004, 0x0001, 0x0001, 0x0003, 0x0001, 0x0001, 0x0001
+	.2byte 0x0001, 0x0001, 0x0004, 0x0001, 0x0001, 0x0003
+
+    .align 1
+gUnknown_0860A68C:: @ 860A68C
+	.2byte 0x0004, 0xfffd, 0xfffa
+
+    .align 1
+gUnknown_0860A692:: @ 860A692
+	.2byte 0x0004, 0x0004, 0x0006, 0x0006, 0x0007, 0x0006, 0x0002
+
+    .align 1
+gUnknown_0860A6A0:: @ 860A6A0
+	.2byte 0x0091, 0x0003, 0x00fa, 0x0003, 0x00be, 0x0003, 0x0080, 0x0003, 0x006e, 0x0003, 0x0098, 0x0003, 0x0143, 0x0003, 0x0123, 0x0003
+	.2byte 0x007f, 0x0003, 0x014a, 0x0003, 0x0039, 0x0003, 0x0134, 0x0003, 0x0038, 0x0003, 0x003d, 0x0003, 0x015a, 0x0000, 0x0037, 0x0003
+	.2byte 0x0160, 0x0003, 0x0137, 0x0003, 0x0057, 0x0003, 0x004c, 0xfffc, 0x013b, 0xfffc, 0x00ac, 0xfffc, 0x0035, 0xfffc, 0x00dd, 0xfffc
+	.2byte 0x007e, 0xfffc, 0x0101, 0xfffc, 0x0034, 0xfffc, 0x0133, 0xfffc, 0x012b, 0xfffc, 0x011c, 0xfffc, 0x0053, 0xfffc, 0x0007, 0xfffc
+	.2byte 0x004c, 0xfffc, 0xffff, 0x0000
+
+    .align 1
+gUnknown_0860A728:: @ 860A728
+	.2byte 0x013b, 0x0003, 0x00ac, 0x0003, 0x0035, 0x0003, 0x00dd, 0x0003, 0x007e, 0x0003, 0x0101, 0x0003, 0x0034, 0x0003, 0x0133, 0x0003
+	.2byte 0x012b, 0x0003, 0x011c, 0x0003, 0x0053, 0x0003, 0x0007, 0x0003, 0x004c, 0x0005, 0x00eb, 0x0003, 0x00ea, 0x0003, 0x00ec, 0x0003
+	.2byte 0x0137, 0x0003, 0xffff, 0x0000
+
+    .align 1
+gUnknown_0860A770:: @ 860A770
+	.2byte 0x0137, 0x0003, 0x004c, 0xfffd, 0xffff, 0x0000
+
+    .align 1
+gUnknown_0860A77C:: @ 860A77C
+	.2byte 0x0137, 0x0003, 0x004c, 0xfffd, 0xffff, 0x0000
+
+    .align 1
+gUnknown_0860A788:: @ 860A788
+	.2byte 0x0055, 0x0003, 0x0009, 0x0003, 0x00d1, 0x0003, 0x0054, 0x0003, 0x00c0, 0x0003, 0x015f, 0x0003, 0x0056, 0x0000, 0x0057, 0x0003
+	.2byte 0x0158, 0x0003, 0xffff, 0x0000
+
+    .align 1
+gUnknown_0860A7B0:: @ 860A7B0
+	.2byte 0x0005, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003, 0x0003
+
+    .align 1
+gUnknown_0860A7BE:: @ 860A7BE
+	.2byte 0x0005, 0x0005, 0x0005, 0x0005, 0x0005
+
+    .align 1
+gUnknown_0860A7C8:: @ 860A7C8
+	.2byte 0x0004
+
+    .align 1
+gUnknown_0860A7CA:: @ 860A7CA
+	.2byte 0x0005
+
+    .align 1
+gUnknown_0860A7CC:: @ 860A7CC
+	.2byte 0x0005
+
+    .align 1
+gUnknown_0860A7CE:: @ 860A7CE
+	.2byte 0x0003
+
+    .align 1
+gUnknown_0860A7D0:: @ 860A7D0
+	.2byte 0x0003
+
+    .align 1
+gUnknown_0860A7D2:: @ 860A7D2
+	.2byte 0x0004
+
+    .align 1
+gUnknown_0860A7D4:: @ 860A7D4
+	.2byte 0x0003
+
+    .align 1
+gUnknown_0860A7D6:: @ 860A7D6
+	.2byte 0x0006
+
+    .align 1
+gUnknown_0860A7D8:: @ 860A7D8
+	.2byte 0x0006
+
+    .align 1
+gUnknown_0860A7DA:: @ 860A7DA
+	.2byte 0x0006
+
+    .align 1
+gUnknown_0860A7DC:: @ 860A7DC
+	.2byte 0x0004
+
+    .align 1
+gUnknown_0860A7DE:: @ 860A7DE
+	.2byte 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002
+
+    .align 1
+gUnknown_0860A7EC:: @ 860A7EC
+	.2byte 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004
+
+    .align 1
+gUnknown_0860A7FA:: @ 860A7FA
+	.2byte 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff, 0xffff
+
+    .align 1
+gUnknown_0860A808:: @ 860A808
+	.2byte 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002, 0x0002
+
+    .align 1
+gUnknown_0860A816:: @ 860A816
+	.2byte 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004, 0x0004
+
+    .align 1
+gUnknown_0860A824:: @ 860A824
+	.2byte 0xfffe, 0xfffe, 0xfffe, 0xfffe, 0xfffe, 0xfffe, 0xfffe
+
+    .align 2
+gUnknown_0860A834:: @ 860A834
+	.4byte gUnknown_0860A4E0
+	.4byte gUnknown_0860A68C
+	.4byte gUnknown_0860A692
+	.4byte gUnknown_0860A6A0
+	.4byte gUnknown_0860A728
+	.4byte gUnknown_0860A770
+	.4byte gUnknown_0860A77C
+	.4byte gUnknown_0860A788
+	.4byte gUnknown_0860A7B0
+	.4byte gUnknown_0860A7BE
+	.4byte gUnknown_0860A7C8
+	.4byte gUnknown_0860A7CA
+	.4byte gUnknown_0860A7CC
+	.4byte gUnknown_0860A7CE
+	.4byte gUnknown_0860A7D0
+	.4byte gUnknown_0860A7D2
+	.4byte gUnknown_0860A7D4
+	.4byte gUnknown_0860A7D6
+	.4byte gUnknown_0860A7D8
+	.4byte gUnknown_0860A7DA
+	.4byte gUnknown_0860A7DA
+	.4byte gUnknown_0860A7DC
+	.4byte gUnknown_0860A7DE
+	.4byte gUnknown_0860A7EC
+	.4byte gUnknown_0860A7FA
+	.4byte gUnknown_0860A808
+	.4byte gUnknown_0860A816
+	.4byte gUnknown_0860A824
+
+    .align 1
+gUnknown_0860A8A4:: @ 860A8A4
+	.2byte 0x0097, 0x00b2, 0x00bc, 0x008c, 0x00b4, 0x00b5, 0x0093, 0x006a, 0x0091, 0x005e, 0x0030, 0x002a, 0x0095, 0x001c, 0x001d, 0x0064
+	.2byte 0x0060, 0xffff
+

data/data2b.s

@@ -1,5 +1,3 @@
-@ the second big chunk of data
-
 #include "constants/items.h"
 #include "constants/moves.h"
 #include "constants/species.h"

data/data2c.s

@@ -1,5 +1,3 @@
-@ the second big chunk of data
-
 #include "constants/abilities.h"
 #include "constants/items.h"
 #include "constants/moves.h"

data/data_860A4AC.s

@@ -1,50 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-gUnknown_0860A4AC:: @ 860A4AC
-	.incbin "baserom.gba", 0x60a4ac, 0x388
-
-gUnknown_0860A834:: @ 860A834
-	.incbin "baserom.gba", 0x60a834, 0x70
-
-gUnknown_0860A8A4:: @ 860A8A4
-	.incbin "baserom.gba", 0x60a8a4, 0x24
-
-gUnknown_0860A8C8:: @ 860A8C8
-	.incbin "baserom.gba", 0x60a8c8, 0x19c
-
-gUnknown_0860AA64:: @ 860AA64
-	.incbin "baserom.gba", 0x60aa64, 0x1c
-
-gUnknown_0860AA80:: @ 860AA80
-	.incbin "baserom.gba", 0x60aa80, 0x8
-
-gUnknown_0860AA88:: @ 860AA88
-	.incbin "baserom.gba", 0x60aa88, 0x25c
-
-gUnknown_0860ACE4:: @ 860ACE4
-	.incbin "baserom.gba", 0x60ace4, 0x4b
-
-gUnknown_0860AD2F:: @ 860AD2F
-	.incbin "baserom.gba", 0x60ad2f, 0x39
-
-gUnknown_0860AD68:: @ 860AD68
-	.incbin "baserom.gba", 0x60ad68, 0x8
-
-gUnknown_0860AD70:: @ 860AD70
-	.incbin "baserom.gba", 0x60ad70, 0x1e
-
-gUnknown_0860AD8E:: @ 860AD8E
-	.incbin "baserom.gba", 0x60ad8e, 0x30
-
-gUnknown_0860ADBE:: @ 860ADBE
-	.incbin "baserom.gba", 0x60adbe, 0xbe
-
-gUnknown_0860AE7C:: @ 860AE7C
-	.incbin "baserom.gba", 0x60ae7c, 0xc
-
-gUnknown_0860AE88:: @ 860AE88
-	.incbin "baserom.gba", 0x60ae88, 0x8
-

data/easy_chat.s

@@ -5,13 +5,207 @@
 	.include "constants/constants.inc"
 
 	.section .rodata
-	.align 2, 0
 
+	.align 2
 gUnknown_08597530:: @ 8597530
-	.incbin "baserom.gba", 0x597530, 0x20
+	.4byte 0x0000001a
+	.4byte sub_811A8CC
+	.4byte 0x00000019
+	.4byte sub_811A8F0
+	.4byte 0x0000001c
+	.4byte sub_811A914
+	.4byte 0x0000001b
+	.4byte sub_811A938
 
 gUnknown_08597550:: @ 8597550
-	.incbin "baserom.gba", 0x597550, 0x1f8
+	.byte 0x00, 0x02, 0x02, 0x00
+
+	.align 2
+	.4byte gText_Profile
+	.4byte gText_CombineFourWordsOrPhrases
+	.4byte gText_AndMakeYourProfile
+	.4byte gText_YourProfile
+	.4byte gText_IsAsShownOkay
+
+	.byte 0x01, 0x02, 0x03, 0x01
+
+	.align 2
+	.4byte gText_AtTheBattlesStart
+	.4byte gText_CombineSixWordsOrPhrases
+	.4byte gText_AndMakeAMessage
+	.4byte gText_YourFeelingAtTheBattlesStart
+	.4byte gText_IsAsShownOkay
+
+	.byte 0x02, 0x02, 0x03, 0x01
+
+	.align 2
+	.4byte gText_UponWinningABattle
+	.4byte gText_CombineSixWordsOrPhrases
+	.4byte gText_AndMakeAMessage
+	.4byte gText_WhatYouSayIfYouWin
+	.4byte gText_IsAsShownOkay
+
+	.byte 0x03, 0x02, 0x03, 0x01
+
+	.align 2
+	.4byte gText_UponLosingABattle
+	.4byte gText_CombineSixWordsOrPhrases
+	.4byte gText_AndMakeAMessage
+	.4byte gText_WhatYouSayIfYouLose
+	.4byte gText_IsAsShownOkay
+
+	.byte 0x04, 0x02, 0x05, 0x02
+
+	.align 2
+	.4byte NULL
+	.4byte gText_CombineNineWordsOrPhrases
+	.4byte gText_AndMakeAMessage2
+	.4byte gText_TheMailMessage
+	.4byte gText_IsAsShownOkay
+
+	.byte 0x05, 0x02, 0x02, 0x05
+
+	.align 2
+	.4byte gText_Interview
+	.4byte gText_CombineFourWordsOrPhrases
+	.4byte gText_LetsReplyToTheInterview
+	.4byte gText_TheAnswer
+	.4byte gText_IsAsShownOkay
+
+	.byte 0x06, 0x02, 0x03, 0x01
+
+	.align 2
+	.4byte gText_TheBardsSong
+	.4byte gText_ChangeJustOneWordOrPhrase
+	.4byte gText_AndImproveTheBardsSong
+	.4byte gText_TheBardsSong2
+	.4byte gText_IsAsShownOkay
+
+	.byte 0x07, 0x01, 0x01, 0x04
+
+	.align 2
+	.4byte gText_Interview
+	.4byte gText_FindWordsThatDescribeYour
+	.4byte gText_FeelingsRightNow
+	.4byte gText_TheAnswer
+	.4byte gText_IsAsShownOkay
+
+	.byte 0x09, 0x02, 0x01, 0x03
+
+	.align 2
+	.4byte gText_WhatsHipAndHappening
+	.4byte gText_CombineTwoWordsOrPhrases
+	.4byte gText_AndMakeATrendySaying
+	.4byte gText_TheTrendySaying
+	.4byte gText_IsAsShownOkay
+
+	.byte 0x10, 0x02, 0x05, 0x87
+
+	.align 2
+	.4byte NULL
+	.4byte gText_AfterYouHaveReadTheQuiz
+	.4byte gText_QuestionPressTheAButton
+	.4byte NULL
+	.4byte NULL
+
+	.byte 0x0f, 0x01, 0x01, 0x86
+
+	.align 2
+	.4byte gText_TheQuizAnswerIs
+	.4byte gText_OutOfTheListedChoices
+	.4byte gText_SelectTheAnswerToTheQuiz
+	.4byte gText_TheAnswerColon
+	.4byte gText_IsAsShownOkay
+
+	.byte 0x11, 0x02, 0x05, 0x88
+
+	.align 2
+	.4byte NULL
+	.4byte gText_CombineNineWordsOrPhrases
+	.4byte gText_AndCreateAQuiz
+	.4byte gText_IsThisQuizOK
+	.4byte NULL
+
+	.byte 0x12, 0x01, 0x01, 0x86
+
+	.align 2
+	.4byte gText_TheQuizAnswerIs
+	.4byte gText_PickAWordOrPhraseAnd
+	.4byte gText_SetTheQuizAnswer
+	.4byte gText_IsThisQuizOK
+	.4byte NULL
+
+	.byte 0x06, 0x02, 0x03, 0x01
+
+	.align 2
+	.4byte gText_TheBardsSong
+	.4byte gText_ChangeJustOneWordOrPhrase
+	.4byte gText_AndImproveTheBardsSong
+	.4byte gText_TheBardsSong2
+	.4byte gText_IsAsShownOkay
+
+	.byte 0x13, 0x02, 0x03, 0x01
+
+	.align 2
+	.4byte gText_ApprenticesPhrase
+	.4byte gText_FindWordsWhichFit
+	.4byte gText_TheTrainersImage
+	.4byte gText_ApprenticePhrase
+	.4byte gText_IsAsShownOkay
+
+	.byte 0x0d, 0x02, 0x01, 0x03
+
+	.align 2
+	.4byte gText_GoodSaying
+	.4byte gText_CombineTwoWordsOrPhrases2
+	.4byte gText_ToTeachHerAGoodSaying
+	.4byte gText_TheAnswer
+	.4byte gText_IsAsShownOkay
+
+	.byte 0x0a, 0x01, 0x01, 0x04
+
+	.align 2
+	.4byte gText_Interview
+	.4byte gText_FindWordsThatDescribeYour
+	.4byte gText_FeelingsRightNow
+	.4byte gText_TheAnswer
+	.4byte gText_IsAsShownOkay
+
+	.byte 0x0c, 0x01, 0x01, 0x04
+
+	.align 2
+	.4byte gText_Interview
+	.4byte gText_FindWordsThatDescribeYour
+	.4byte gText_FeelingsRightNow
+	.4byte gText_TheAnswer
+	.4byte gText_IsAsShownOkay
+
+	.byte 0x0b, 0x01, 0x01, 0x04
+
+	.align 2
+	.4byte gText_Interview
+	.4byte gText_FindWordsThatDescribeYour
+	.4byte gText_FeelingsRightNow
+	.4byte gText_TheAnswer
+	.4byte gText_IsAsShownOkay
+
+	.byte 0x0e, 0x01, 0x01, 0x04
+
+	.align 2
+	.4byte gText_FansQuestion
+	.4byte gText_FindWordsWhichFit
+	.4byte gText_TheTrainersImage
+	.4byte gText_TheImage
+	.4byte gText_IsAsShownOkay
+
+	.byte 0x14, 0x02, 0x02, 0x00
+
+	.align 2
+	.4byte gText_Questionnaire
+	.4byte gText_CombineFourWordsOrPhrases
+	.4byte gText_AndFillOutTheQuestionnaire
+	.4byte gText_TheAnswer
+	.4byte gText_IsAsShownOkay
 
 gUnknown_08597748:: @ 8597748
 	.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
@@ -20,109 +214,239 @@ gUnknown_08597764:: @ 8597764
 	.2byte 0x0209, 0x140b, 0x1030, 0x102a
 
 gUnknown_0859776C:: @ 859776C
-	.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
+	.2byte 0x1240, 0x0628, 0x061f, 0x2204, 0x1422, 0x0197, 0x0415, 0x0198, 0x2207, 0x0449
 
+	.align 2
+gUnknown_08597780:: @ 8597780
+	.incbin "graphics/misc/interview_triangle_cursor.gbapal"
+
+	.align 2
+gUnknown_085977A0:: @ 85977A0
+	.incbin "graphics/misc/interview_triangle_cursor.4bpp"
+
+	.align 2
+gUnknown_085977C0:: @ 85977C0
+	.incbin "graphics/misc/interview_arrow.4bpp"
+
+	.align 2
+gUnknown_085978C0:: @ 85978C0
+	.incbin "graphics/misc/interview_buttons.4bpp"
+
+	.align 2
+gUnknown_085979C0:: @ 85979C0
+	.incbin "graphics/misc/interview_frame.gbapal"
+
+	.align 2
+gUnknown_085979E0:: @ 85979E0
+	.incbin "graphics/misc/interview_frame.4bpp.lz"
+
+	.align 2
 gUnknown_08597B14:: @ 8597B14
-	.incbin "baserom.gba", 0x597b14, 0x20
+	.incbin "graphics/misc/interview_frame_orange.gbapal"
 
+	.align 2
 gUnknown_08597B34:: @ 8597B34
-	.incbin "baserom.gba", 0x597b34, 0x20
+	.incbin "graphics/misc/interview_frame_green.gbapal"
 
+	.align 2
 gUnknown_08597B54:: @ 8597B54
-	.incbin "baserom.gba", 0x597b54, 0xc8
+	.incbin "graphics/misc/interview_frame_2.4bpp.lz"
 
+	.align 2
 gUnknown_08597C1C:: @ 8597C1C
-	.incbin "baserom.gba", 0x597c1c, 0x8
+	.incbin "graphics/misc/8597C1C.gbapal"
 
+	.align 2
 gUnknown_08597C24:: @ 8597C24
-	.incbin "baserom.gba", 0x597c24, 0xc
+	.incbin "graphics/misc/8597C24.gbapal"
 
 gUnknown_08597C30:: @ 8597C30
 	.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
 
+	.align 2
 gUnknown_08597C54:: @ 8597C54
-	.incbin "baserom.gba", 0x597c54, 0x10
+	.4byte 0x000001c0, 0x000011dd, 0x002021e2, 0x000031fb
 
+	.align 2
 gUnknown_08597C64:: @ 8597C64
-	.incbin "baserom.gba", 0x597c64, 0x20
+	window_template 0x01, 0x06, 0x00, 0x12, 0x02, 0x0a, 0x0010
+	window_template 0x00, 0x03, 0x0f, 0x18, 0x04, 0x0f, 0x000a
+	window_template 0x02, 0x01, 0x00, 0x1c, 0x20, 0x03, 0x0000
+	window_template_terminator
 
+	.align 2
 gUnknown_08597C84:: @ 8597C84
-	.incbin "baserom.gba", 0x597c84, 0x8
+	window_template 0x00, 0x16, 0x09, 0x05, 0x04, 0x0f, 0x006a
 
 gUnknown_08597C8C:: @ 8597C8C
-	.incbin "baserom.gba", 0x597c8c, 0x4
+	.string "{CLEAR 17}$"
 
+	.align 2
 gUnknown_08597C90:: @ 8597C90
 	.4byte gUnknown_862B810
 	.4byte gUnknown_862B832
 	.4byte gUnknown_862B84B
 	.4byte gUnknown_862B86C
 
+	.align 2
 gUnknown_08597CA0:: @ 8597CA0
-	.incbin "baserom.gba", 0x597ca0, 0x20
+	obj_tiles gUnknown_085977A0, 0x0020, 0x0000
+	obj_tiles gUnknown_085977C0, 0x0100, 0x0002
+	obj_tiles gUnknown_085978C0, 0x0100, 0x0003
+	null_obj_tiles
 
+	.align 2
 gUnknown_08597CC0:: @ 8597CC0
-	.incbin "baserom.gba", 0x597cc0, 0x28
+	obj_pal gUnknown_08597780, 0x0000
+	obj_pal gEasyChatCursor_Pal, 0x0001
+	obj_pal gEasyChatRightWindow_Pal, 0x0002
+	obj_pal gUnknown_085979C0, 0x0003
+	null_obj_pal
 
+	.align 2
 gUnknown_08597CE8:: @ 8597CE8
-	.incbin "baserom.gba", 0x597ce8, 0x20
+	obj_tiles gUnknown_085979E0, 0x0800, 0x0005
+	obj_tiles gEasyChatCursor_Gfx, 0x1000, 0x0001
+	obj_tiles gEasyChatRightWindow_Gfx, 0x0800, 0x0006
+	obj_tiles gEasyChatMode_Gfx, 0x1000, 0x0004
 
 gUnknown_08597D08:: @ 8597D08
-	.byte 0x00, 0x0c, 0x18, 0x38, 0x44, 0x50, 0x5c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00
+	.byte 0x00, 0x0c, 0x18, 0x38, 0x44, 0x50, 0x5c, 0x00
 
+	.align 2
+gOamData_8597D10:: @ 8597D10
+	.2byte 0x0000
+	.2byte 0x0000
+	.2byte 0x0C00
+
+	.align 2
 gUnknown_08597D18:: @ 8597D18
-	.incbin "baserom.gba", 0x597d18, 0x50
+	spr_template 0x0000, 0x0000, gOamData_8597D10, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, sub_811DF28
 
+	.align 2
+gUnknown_08597D30:: @ 8597D30
+	.2byte 0x4000, 0xc000, 0x0400, 0x0000
+
+	.align 2
+gUnknown_08597D38:: @ 8597D38
+	.2byte 0x0000, 0x0000, 0xffff, 0x0000
+
+	.align 2
+gUnknown_08597D40:: @ 8597D40
+	.2byte 0x0020, 0x0000, 0xffff, 0x0000
+
+	.align 2
+gUnknown_08597D48:: @ 8597D48
+	.2byte 0x0040, 0x0000, 0xffff, 0x0000
+
+	.align 2
+gUnknown_08597D50:: @ 8597D50
+	.2byte 0x0060, 0x0000, 0xffff, 0x0000
+
+	.align 2
+gUnknown_08597D58:: @ 8597D58
+	.4byte gUnknown_08597D38
+	.4byte gUnknown_08597D40
+	.4byte gUnknown_08597D48
+	.4byte gUnknown_08597D50
+
+	.align 2
 gUnknown_08597D68:: @ 8597D68
-	.incbin "baserom.gba", 0x597d68, 0x68
+	spr_template 0x0001, 0x0001, gUnknown_08597D30, gUnknown_08597D58, NULL, gDummySpriteAffineAnimTable, sub_811DF28
 
+	.align 2
+gUnknown_08597D80:: @ 8597D80
+	.2byte 0x4000, 0xc000, 0x0400, 0x0000
+
+	.align 2
+gUnknown_08597D88:: @ 8597D88
+	.2byte 0x0060, 0x0000, 0xffff, 0x0000
+
+	.align 2
+gUnknown_08597D90:: @ 8597D90
+	.2byte 0x0040, 0x0004, 0x0020, 0x0004, 0xffff, 0x0000
+
+	.align 2
+gUnknown_08597D9C:: @ 8597D9C
+	.2byte 0x0040, 0x0004, 0x0000, 0x0004, 0xffff, 0x0000
+
+	.align 2
+gUnknown_08597DA8:: @ 8597DA8
+	.2byte 0x0040, 0x0004, 0x0060, 0x0000, 0xffff, 0x0000
+
+	.align 2
+gUnknown_08597DB4:: @ 8597DB4
+	.2byte 0x0040, 0x0004, 0xffff, 0x0000
+
+	.align 2
+gUnknown_08597DBC:: @ 8597DBC
+	.4byte gUnknown_08597D88
+	.4byte gUnknown_08597D90
+	.4byte gUnknown_08597D9C
+	.4byte gUnknown_08597DA8
+	.4byte gUnknown_08597DB4
+
+	.align 2
 gUnknown_08597DD0:: @ 8597DD0
-	.incbin "baserom.gba", 0x597dd0, 0x20
+	spr_template 0x0004, 0x0002, gUnknown_08597D80, gUnknown_08597DBC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
+	.align 2
+gUnknown_08597DE8:: @ 8597DE8
+	.2byte 0x0000, 0xc000, 0x0c00, 0x0000
+
+	.align 2
 gUnknown_08597DF0:: @ 8597DF0
-	.incbin "baserom.gba", 0x597df0, 0x40
+	spr_template 0x0006, 0x0002, gUnknown_08597DE8, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
+	.align 2
+gUnknown_08597E08:: @ 8597E08
+	.2byte 0x4000, 0x4000, 0x0400, 0x0000
+
+	.align 2
+gUnknown_08597E10:: @ 8597E10
+	.2byte 0x0000, 0x4000, 0x0400, 0x0000
+
+	.align 2
+gUnknown_08597E18:: @ 8597E18
+	.2byte 0x0000, 0x0000, 0xffff, 0x0000
+
+	.align 2
+gUnknown_08597E20:: @ 8597E20
+	.2byte 0x0004, 0x0000, 0xffff, 0x0000
+
+	.align 2
+gUnknown_08597E28:: @ 8597E28
+	.4byte gUnknown_08597E18
+	.4byte gUnknown_08597E20
+
+	.align 2
 gUnknown_08597E30:: @ 8597E30
-	.incbin "baserom.gba", 0x597e30, 0x18
+	spr_template 0x0003, 0x0002, gUnknown_08597E08, gUnknown_08597E28, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
+	.align 2
 gUnknown_08597E48:: @ 8597E48
-	.incbin "baserom.gba", 0x597e48, 0x18
+	spr_template 0x0002, 0x0002, gUnknown_08597E10, gUnknown_08597E28, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
 gUnknown_08597E60:: @ 8597E60
 	.byte 0x10, 0x6f, 0xc4, 0x00, 0x10, 0x4e, 0x82, 0xa0, 0x10, 0x50, 0x86, 0xaa
 
+	.align 2
 gUnknown_08597E6C:: @ 8597E6C
-	.incbin "baserom.gba", 0x597e6c, 0x30
+	.4byte gText_DelAll
+	.4byte gText_Cancel5
+	.4byte gText_Ok2
+	.4byte NULL
+
+	.4byte gText_DelAll
+	.4byte gText_Cancel5
+	.4byte gText_Ok2
+	.4byte gText_Quiz
+
+	.4byte gText_DelAll
+	.4byte gText_Cancel5
+	.4byte gText_Ok2
+	.4byte gText_Answer
 
 @ 8597E9C
 	.include "data/text/easy_chat/easy_chat_groups.inc"

data/field_door.s

@@ -1,17 +0,0 @@
-    .include "asm/macros.inc"
-    .include "constants/constants.inc"
-
-    .section .rodata
-    .align 2, 0
-
-gUnknown_08496F8C:: @ 8496F8C
-	.incbin "baserom.gba", 0x496f8c, 0x14
-
-gUnknown_08496FA0:: @ 8496FA0
-	.incbin "baserom.gba", 0x496fa0, 0x14
-
-gUnknown_08496FB4:: @ 8496FB4
-	.incbin "baserom.gba", 0x496fb4, 0x1c0
-
-gUnknown_08497174:: @ 8497174
-	.incbin "baserom.gba", 0x497174, 0x288

data/graphics.s

@@ -4476,7 +4476,7 @@ gBerryBlenderArrowTiles:: @ 8DCAB88
 	.space 0x2C0
 
 	.align 2
-gEasyChatCursor_Pal::
+gEasyChatCursor_Pal:: @ 8DCB648
 	.incbin "graphics/easy_chat/cursor.gbapal"
 
 	.align 2
@@ -4484,11 +4484,11 @@ gEasyChatCursor_Gfx:: @ 8DCB668
 	.incbin "graphics/easy_chat/cursor.4bpp.lz"
 
 	.align 2
-gEasyChatRightWindow_Pal::
+gEasyChatRightWindow_Pal:: @ 8DCB86C
 	.incbin "graphics/easy_chat/rwindow.gbapal"
 
 	.align 2
-gEasyChatRightWindow_Gfx::
+gEasyChatRightWindow_Gfx:: @ 8DCB88C
 	.incbin "graphics/easy_chat/rwindow.4bpp.lz"
 
 	.align 2

data/pokemon_animation.s

@@ -0,0 +1,240 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+
+gUnknown_0860A8C8:: @ 860A8C8
+	.byte 0x00, 0x13, 0x02, 0x08, 0x12, 0x15, 0x17, 0x12, 0x12, 0x19, 0x02, 0x13, 0x11, 0x02, 0x13, 0x01, 0x0f, 0x15, 0x0f, 0x0a, 0x0a, 0x0f, 0x15, 0x0f, 0x09, 0x16, 0x16, 0x12, 0x10, 0x12, 0x15, 0x09
+	.byte 0x12, 0x15, 0x09, 0x13, 0x13, 0x10, 0x01, 0x13, 0x06, 0x11, 0x09, 0x02, 0x02, 0x14, 0x02, 0x08, 0x0a, 0x11, 0x09, 0x09, 0x10, 0x0f, 0x02, 0x14, 0x10, 0x10, 0x15, 0x15, 0x12, 0x09, 0x0e, 0x14
+	.byte 0x14, 0x0d, 0x15, 0x09, 0x09, 0x0b, 0x0b, 0x0b, 0x02, 0x02, 0x0e, 0x08, 0x08, 0x17, 0x15, 0x02, 0x13, 0x0f, 0x0f, 0x02, 0x0f, 0x15, 0x13, 0x02, 0x0b, 0x0c, 0x13, 0x0f, 0x01, 0x01, 0x14, 0x09
+	.byte 0x13, 0x14, 0x0a, 0x09, 0x15, 0x15, 0x02, 0x10, 0x15, 0x10, 0x02, 0x0f, 0x02, 0x06, 0x06, 0x0e, 0x0e, 0x12, 0x0b, 0x12, 0x13, 0x11, 0x11, 0x11, 0x13, 0x19, 0x14, 0x0f, 0x13, 0x16, 0x17, 0x0e
+	.byte 0x0e, 0x10, 0x09, 0x19, 0x05, 0x12, 0x19, 0x16, 0x17, 0x01, 0x13, 0x13, 0x13, 0x15, 0x15, 0x13, 0x19, 0x16, 0x17, 0x02, 0x0f, 0x09, 0x0d, 0x12, 0x12, 0x02, 0x09, 0x12, 0x15, 0x17, 0x15, 0x15
+	.byte 0x09, 0x12, 0x10, 0x11, 0x0f, 0x0a, 0x11, 0x0a, 0x02, 0x0f, 0x0b, 0x16, 0x12, 0x13, 0x13, 0x13, 0x11, 0x12, 0x14, 0x12, 0x13, 0x16, 0x11, 0x12, 0x13, 0x02, 0x10, 0x11, 0x11, 0x11, 0x10, 0x13
+	.byte 0x02, 0x11, 0x0b, 0x02, 0x14, 0x14, 0x12, 0x13, 0x01, 0x14, 0x0b, 0x14, 0x08, 0x09, 0x0f, 0x05, 0x09, 0x15, 0x09, 0x0d, 0x15, 0x13, 0x15, 0x0f, 0x13, 0x09, 0x17, 0x17, 0x0a, 0x08, 0x02, 0x02
+	.byte 0x05, 0x0f, 0x02, 0x15, 0x09, 0x09, 0x19, 0x15, 0x0e, 0x01, 0x13, 0x02, 0x0f, 0x07, 0x02, 0x08, 0x17, 0x02, 0x13, 0x16, 0x17, 0x19, 0x0e, 0x09, 0x0e, 0x19, 0x17, 0x18, 0x00, 0x00, 0x00, 0x00
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x15, 0x09, 0x12, 0x10, 0x17, 0x02, 0x12, 0x19, 0x12, 0x08
+	.byte 0x0f, 0x15, 0x0b, 0x08, 0x11, 0x08, 0x0f, 0x02, 0x10, 0x10, 0x13, 0x09, 0x14, 0x0a, 0x01, 0x14, 0x12, 0x15, 0x13, 0x15, 0x07, 0x11, 0x11, 0x03, 0x11, 0x19, 0x19, 0x13, 0x12, 0x01, 0x13, 0x14
+	.byte 0x0e, 0x17, 0x01, 0x0b, 0x09, 0x04, 0x0f, 0x15, 0x03, 0x19, 0x04, 0x15, 0x13, 0x01, 0x0f, 0x0e, 0x0e, 0x15, 0x09, 0x0e, 0x17, 0x13, 0x09, 0x09, 0x0a, 0x08, 0x0f, 0x0f, 0x13, 0x13, 0x10, 0x10
+	.byte 0x14, 0x12, 0x12, 0x09, 0x14, 0x14, 0x11, 0x11, 0x12, 0x01, 0x01, 0x18, 0x02, 0x10, 0x08, 0x0b, 0x0b, 0x0e, 0x13, 0x09, 0x0d, 0x13, 0x11, 0x11, 0x14, 0x01, 0x01, 0x0b, 0x15, 0x02, 0x15, 0x09
+	.byte 0x0e, 0x11, 0x11, 0x11, 0x0c, 0x0b, 0x0f, 0x09, 0x14, 0x14, 0x14, 0x09, 0x09, 0x08, 0x0f, 0x15, 0x09, 0x09, 0x09, 0x09, 0x19, 0x17, 0x0d, 0x01, 0x01, 0x11, 0x14, 0x11
+
+gUnknown_0860AA64:: @ 860AA64
+	.byte 0x00, 0x05, 0x01, 0x01, 0x00, 0x0f, 0x01, 0x04, 0x00, 0x02, 0x01, 0x02, 0x00, 0x02, 0x01, 0x02, 0x00, 0x02, 0x01, 0x02, 0x00, 0x02, 0x01, 0x02, 0x00, 0x02, 0x00, 0xff
+
+gUnknown_0860AA80:: @ 860AA80
+	.byte 0x06, 0x1e, 0xfe, 0x0f, 0x06, 0x1e, 0xff, 0x00
+
+	.align 2
+gUnknown_0860AA88:: @ 860AA88
+	.4byte pokemonanimfunc_00
+	.4byte pokemonanimfunc_01
+	.4byte pokemonanimfunc_02
+	.4byte pokemonanimfunc_03
+	.4byte pokemonanimfunc_04
+	.4byte pokemonanimfunc_05
+	.4byte pokemonanimfunc_06
+	.4byte pokemonanimfunc_07
+	.4byte pokemonanimfunc_08
+	.4byte pokemonanimfunc_09
+	.4byte pokemonanimfunc_0A
+	.4byte pokemonanimfunc_0B
+	.4byte pokemonanimfunc_0C
+	.4byte pokemonanimfunc_0D
+	.4byte pokemonanimfunc_0E
+	.4byte pokemonanimfunc_0F
+	.4byte pokemonanimfunc_10
+	.4byte pokemonanimfunc_11
+	.4byte pokemonanimfunc_12
+	.4byte pokemonanimfunc_13
+	.4byte pokemonanimfunc_14
+	.4byte pokemonanimfunc_15
+	.4byte pokemonanimfunc_16
+	.4byte pokemonanimfunc_17
+	.4byte pokemonanimfunc_18
+	.4byte pokemonanimfunc_19
+	.4byte pokemonanimfunc_1A
+	.4byte pokemonanimfunc_1B
+	.4byte pokemonanimfunc_1C
+	.4byte pokemonanimfunc_1D
+	.4byte pokemonanimfunc_1E
+	.4byte pokemonanimfunc_1F
+	.4byte pokemonanimfunc_20
+	.4byte pokemonanimfunc_21
+	.4byte pokemonanimfunc_22
+	.4byte pokemonanimfunc_23
+	.4byte pokemonanimfunc_24
+	.4byte pokemonanimfunc_25
+	.4byte pokemonanimfunc_26
+	.4byte pokemonanimfunc_27
+	.4byte pokemonanimfunc_28
+	.4byte pokemonanimfunc_29
+	.4byte pokemonanimfunc_2A
+	.4byte pokemonanimfunc_2B
+	.4byte pokemonanimfunc_2C
+	.4byte pokemonanimfunc_2D
+	.4byte pokemonanimfunc_2E
+	.4byte pokemonanimfunc_2F
+	.4byte pokemonanimfunc_30
+	.4byte pokemonanimfunc_31
+	.4byte pokemonanimfunc_32
+	.4byte pokemonanimfunc_33
+	.4byte pokemonanimfunc_34
+	.4byte pokemonanimfunc_35
+	.4byte pokemonanimfunc_36
+	.4byte pokemonanimfunc_37
+	.4byte pokemonanimfunc_38
+	.4byte pokemonanimfunc_39
+	.4byte pokemonanimfunc_3A
+	.4byte pokemonanimfunc_3B
+	.4byte pokemonanimfunc_3C
+	.4byte pokemonanimfunc_3D
+	.4byte pokemonanimfunc_3E
+	.4byte pokemonanimfunc_3F
+	.4byte pokemonanimfunc_40
+	.4byte pokemonanimfunc_41
+	.4byte pokemonanimfunc_42
+	.4byte pokemonanimfunc_43
+	.4byte pokemonanimfunc_44
+	.4byte pokemonanimfunc_45
+	.4byte pokemonanimfunc_46
+	.4byte pokemonanimfunc_47
+	.4byte pokemonanimfunc_48
+	.4byte pokemonanimfunc_49
+	.4byte pokemonanimfunc_4A
+	.4byte pokemonanimfunc_4B
+	.4byte pokemonanimfunc_4C
+	.4byte pokemonanimfunc_4D
+	.4byte pokemonanimfunc_4E
+	.4byte pokemonanimfunc_4F
+	.4byte pokemonanimfunc_50
+	.4byte pokemonanimfunc_51
+	.4byte pokemonanimfunc_52
+	.4byte pokemonanimfunc_53
+	.4byte pokemonanimfunc_54
+	.4byte pokemonanimfunc_55
+	.4byte pokemonanimfunc_56
+	.4byte pokemonanimfunc_57
+	.4byte pokemonanimfunc_58
+	.4byte pokemonanimfunc_59
+	.4byte pokemonanimfunc_5A
+	.4byte pokemonanimfunc_5B
+	.4byte pokemonanimfunc_5C
+	.4byte pokemonanimfunc_5D
+	.4byte pokemonanimfunc_5E
+	.4byte pokemonanimfunc_5F
+	.4byte pokemonanimfunc_60
+	.4byte pokemonanimfunc_61
+	.4byte pokemonanimfunc_62
+	.4byte pokemonanimfunc_63
+	.4byte pokemonanimfunc_64
+	.4byte pokemonanimfunc_65
+	.4byte pokemonanimfunc_66
+	.4byte pokemonanimfunc_67
+	.4byte pokemonanimfunc_68
+	.4byte pokemonanimfunc_69
+	.4byte pokemonanimfunc_6A
+	.4byte pokemonanimfunc_6B
+	.4byte pokemonanimfunc_6C
+	.4byte pokemonanimfunc_6D
+	.4byte pokemonanimfunc_6E
+	.4byte pokemonanimfunc_6F
+	.4byte pokemonanimfunc_70
+	.4byte pokemonanimfunc_71
+	.4byte pokemonanimfunc_72
+	.4byte pokemonanimfunc_73
+	.4byte pokemonanimfunc_74
+	.4byte pokemonanimfunc_75
+	.4byte pokemonanimfunc_76
+	.4byte pokemonanimfunc_77
+	.4byte pokemonanimfunc_78
+	.4byte pokemonanimfunc_79
+	.4byte pokemonanimfunc_7A
+	.4byte pokemonanimfunc_7B
+	.4byte pokemonanimfunc_7C
+	.4byte pokemonanimfunc_7D
+	.4byte pokemonanimfunc_7E
+	.4byte pokemonanimfunc_7F
+	.4byte pokemonanimfunc_80
+	.4byte pokemonanimfunc_81
+	.4byte pokemonanimfunc_82
+	.4byte pokemonanimfunc_83
+	.4byte pokemonanimfunc_84
+	.4byte pokemonanimfunc_85
+	.4byte pokemonanimfunc_86
+	.4byte pokemonanimfunc_87
+	.4byte pokemonanimfunc_88
+	.4byte pokemonanimfunc_89
+	.4byte pokemonanimfunc_8A
+	.4byte pokemonanimfunc_8B
+	.4byte pokemonanimfunc_8C
+	.4byte pokemonanimfunc_8D
+	.4byte pokemonanimfunc_8E
+	.4byte pokemonanimfunc_8F
+	.4byte pokemonanimfunc_90
+	.4byte pokemonanimfunc_91
+	.4byte pokemonanimfunc_92
+	.4byte pokemonanimfunc_93
+	.4byte pokemonanimfunc_94
+	.4byte pokemonanimfunc_95
+	.4byte pokemonanimfunc_96
+
+gUnknown_0860ACE4:: @ 860ACE4
+	.byte 0x60, 0x5f, 0x02, 0x5e, 0x03, 0x46, 0x6d, 0x3e, 0x6e, 0x6f, 0x70, 0x3f, 0x71, 0x13, 0x72, 0x6c, 0x6b, 0x3a, 0x64, 0x14, 0x4f, 0x5d, 0x0f, 0x4c, 0x61, 0x57, 0x58, 0x67, 0x66, 0x59, 0x74, 0x73
+	.byte 0x5a, 0x75, 0x76, 0x5b, 0x77, 0x78, 0x65, 0x63, 0x5c, 0x62, 0x6a, 0x69, 0x68, 0x7b, 0x7a, 0x79, 0x7e, 0x7d, 0x7c, 0x81, 0x80, 0x7f, 0x84, 0x82, 0x83, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b
+	.byte 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96
+
+gUnknown_0860AD2F:: @ 860AD2F
+	.byte 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x02, 0x00, 0x01, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x02, 0x01, 0x02, 0x01
+
+	.align 2
+gSpriteAffineAnim_860AD48:: @ 860AD48
+	obj_rot_scal_anim_frame 0x100, 0x100, 0, 0
+	obj_rot_scal_anim_end
+
+	.align 2
+gSpriteAffineAnim_860AD58:: @ 860AD58
+	obj_rot_scal_anim_frame -0x100, 0x100, 0, 0
+	obj_rot_scal_anim_end
+
+	.align 2
+gSpriteAffineAnimTable_860AD68:: @ 860AD68
+	.4byte gSpriteAffineAnim_860AD48
+	.4byte gSpriteAffineAnim_860AD58
+
+gUnknown_0860AD70:: @ 860AD70
+	.byte 0xff, 0xff, 0x06, 0x02, 0x00, 0x06, 0xfe, 0x02, 0x06, 0x02, 0x00, 0x06, 0xfe, 0xfe, 0x06, 0x02, 0x00, 0x06, 0xfe, 0x02, 0x06, 0x02, 0x00, 0x06, 0xff, 0xff, 0x06, 0x00, 0x00, 0x00
+
+gUnknown_0860AD8E:: @ 860AD8E
+	.byte 0x00, 0x08, 0x08, 0x08, 0xf8, 0x0c, 0xf8, 0x08, 0x0c, 0x08, 0xf8, 0x0c, 0xf8, 0x08, 0x0c, 0x08, 0xf8, 0x0c, 0xf8, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x08, 0x10, 0x08, 0xf8, 0x18, 0xf8, 0x08
+	.byte 0x18, 0x08, 0xf8, 0x18, 0xf8, 0x08, 0x18, 0x08, 0xf8, 0x18, 0xf8, 0x00, 0x18, 0x00, 0x00, 0x00
+
+gUnknown_0860ADBE:: @ 860ADBE
+	.byte 0x01, 0x01, 0x0c, 0xfe, 0x00, 0x0c, 0x01, 0xff, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00
+
+gUnknown_0860ADCC:: @ 860ADCC
+	.byte 0x00, 0x01, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00
+	.byte 0x00, 0x0f, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00
+	.byte 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00
+	.byte 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00
+	.byte 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00
+
+gUnknown_0860AE1C:: @ 860AE1C
+	.byte 0x00, 0x05, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x0f, 0x00, 0x00, 0x01, 0x04, 0x00, 0x00
+	.byte 0x00, 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00
+	.byte 0x00, 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00
+	.byte 0x00, 0x02, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00
+
+gUnknown_0860AE54:: @ 860AE54
+	.byte 0x00, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00
+	.byte 0x00, 0x14, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00, 0x14, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00
+	.byte 0x00, 0x01, 0x00, 0x00, 0x00, 0xff, 0x00, 0x00
+
+	.align 2
+gUnknown_0860AE7C:: @ 860AE7C
+	.4byte gUnknown_0860ADCC
+	.4byte gUnknown_0860AE1C
+	.4byte gUnknown_0860AE54
+
+	.align 1
+gUnknown_0860AE88:: @ 860AE88
+	.2byte 0x001f, 0x03e0, 0x7c00, 0x0000

data/rom_8486FEC.s

@@ -1,8 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-	.align 2, 0
-
-gUnknown_8486FEC:: @ 8486FEC
-	.incbin "baserom.gba", 0x486fec, 0xFFA0

data/sound_data.s

@@ -1,14 +1,13 @@
 	.section .rodata
 
 	.include "asm/macros/m4a.inc"
+	.include "asm/macros/music_voice.inc"
 
 	.include "sound/voice_groups.inc"
-
-	@ keysplit tables, programmable wave data
-	.incbin "baserom.gba", 0x6b4698, 0x328
-
+	.include "sound/keysplit_tables.inc"
+	.include "sound/programmable_wave_data.inc"
 	.include "sound/music_player_table.inc"
 	.include "sound/song_table.inc"
+	.include "sound/direct_sound_data.inc"
 
-	@ direct sound data
-	.incbin "baserom.gba", 0x6b5d04, 0x246338
+	.align 2

data/strings.s

@@ -2906,112 +2906,112 @@ gUnknown_085EC04F:: @ 85EC04F
 gUnknown_085EC063:: @ 85EC063
 	.string "{SPECIAL_F7 0x00}/{LV}{SPECIAL_F7 0x01}{SPECIAL_F7 0x02}$"
 
-gUnknown_085EC06C:: @ 85EC06C
+gText_CombineFourWordsOrPhrases:: @ 85EC06C
 	.string "Combine four words or phrases$"
 
-gUnknown_085EC08A:: @ 85EC08A
+gText_AndMakeYourProfile:: @ 85EC08A
 	.string "and make your profile.$"
 
-gUnknown_085EC0A1:: @ 85EC0A1
+gText_CombineSixWordsOrPhrases:: @ 85EC0A1
 	.string "Combine six words or phrases$"
 
-gUnknown_085EC0BE:: @ 85EC0BE
+gText_AndMakeAMessage:: @ 85EC0BE
 	.string "and make a message.$"
 
-gUnknown_085EC0D2:: @ 85EC0D2
+gText_FindWordsThatDescribeYour:: @ 85EC0D2
 	.string "Find words that describe your$"
 
-gUnknown_085EC0F0:: @ 85EC0F0
+gText_FeelingsRightNow:: @ 85EC0F0
 	.string "feelings right now.$"
 
 gUnknown_085EC104:: @ 85EC104
 	.string "With four phrases,$"
 
-gUnknown_085EC117:: @ 85EC117
+gText_CombineNineWordsOrPhrases:: @ 85EC117
 	.string "Combine nine words or phrases$"
 
-gUnknown_085EC135:: @ 85EC135
+gText_AndMakeAMessage2:: @ 85EC135
 	.string "and make a message.$"
 
-gUnknown_085EC149:: @ 85EC149
+gText_ChangeJustOneWordOrPhrase:: @ 85EC149
 	.string "Change just one word or phrase$"
 
-gUnknown_085EC168:: @ 85EC168
+gText_AndImproveTheBardsSong:: @ 85EC168
 	.string "and improve the BARD’s song.$"
 
-gUnknown_085EC185:: @ 85EC185
+gText_YourProfile:: @ 85EC185
 	.string "Your profile$"
 
-gUnknown_085EC192:: @ 85EC192
+gText_YourFeelingAtTheBattlesStart:: @ 85EC192
 	.string "Your feeling at the battle’s start$"
 
-gUnknown_085EC1B5:: @ 85EC1B5
+gText_WhatYouSayIfYouWin:: @ 85EC1B5
 	.string "What you say if you win a battle$"
 
-gUnknown_085EC1D6:: @ 85EC1D6
+gText_WhatYouSayIfYouLose:: @ 85EC1D6
 	.string "What you say if you lose a battle$"
 
-gUnknown_085EC1F8:: @ 85EC1F8
+gText_TheAnswer:: @ 85EC1F8
 	.string "The answer$"
 
-gUnknown_085EC203:: @ 85EC203
+gText_TheMailMessage:: @ 85EC203
 	.string "The MAIL message$"
 
 gUnknown_085EC214:: @ 85EC214
 	.string "The MAIL salutation$"
 
-gUnknown_085EC228:: @ 85EC228
+gText_TheBardsSong2:: @ 85EC228
 	.string "The new song$"
 
-gUnknown_085EC235:: @ 85EC235
+gText_CombineTwoWordsOrPhrases:: @ 85EC235
 	.string "Combine two words or phrases$"
 
-gUnknown_085EC252:: @ 85EC252
+gText_AndMakeATrendySaying:: @ 85EC252
 	.string "and make a trendy saying.$"
 
-gUnknown_085EC26C:: @ 85EC26C
+gText_TheTrendySaying:: @ 85EC26C
 	.string "The trendy saying$"
 
-gUnknown_085EC27E:: @ 85EC27E
+gText_IsAsShownOkay:: @ 85EC27E
 	.string "is as shown. Okay?$"
 
-gUnknown_085EC291:: @ 85EC291
+gText_CombineTwoWordsOrPhrases2:: @ 85EC291
 	.string "Combine two words or phrases$"
 
-gUnknown_085EC2AE:: @ 85EC2AE
+gText_ToTeachHerAGoodSaying:: @ 85EC2AE
 	.string "to teach her a good saying.$"
 
-gUnknown_085EC2CA:: @ 85EC2CA
+gText_FindWordsWhichFit:: @ 85EC2CA
 	.string "Find words which fit$"
 
-gUnknown_085EC2DF:: @ 85EC2DF
+gText_TheTrainersImage:: @ 85EC2DF
 	.string "the TRAINER’s image.$"
 
-gUnknown_085EC2F4:: @ 85EC2F4
+gText_TheImage:: @ 85EC2F4
 	.string "The image:$"
 
-gUnknown_085EC2FF:: @ 85EC2FF
+gText_OutOfTheListedChoices:: @ 85EC2FF
 	.string "Out of the listed choices,$"
 
-gUnknown_085EC31A:: @ 85EC31A
+gText_SelectTheAnswerToTheQuiz:: @ 85EC31A
 	.string "select the answer to the quiz!$"
 
-gUnknown_085EC339:: @ 85EC339
+gText_AndCreateAQuiz:: @ 85EC339
 	.string "and create a quiz!$"
 
-gUnknown_085EC34C:: @ 85EC34C
+gText_PickAWordOrPhraseAnd:: @ 85EC34C
 	.string "Pick a word or phrase and$"
 
-gUnknown_085EC366:: @ 85EC366
+gText_SetTheQuizAnswer:: @ 85EC366
 	.string "set the quiz answer.$"
 
-gUnknown_085EC37B:: @ 85EC37B
+gText_TheAnswerColon:: @ 85EC37B
 	.string "The answer:$"
 
 gUnknown_085EC387:: @ 85EC387
 	.string "The quiz:$"
 
-gUnknown_085EC391:: @ 85EC391
+gText_ApprenticePhrase:: @ 85EC391
 	.string "Apprentice’s phrase:$"
 
 gText_QuitEditing:: @ 85EC3A6
@@ -3020,10 +3020,10 @@ gText_QuitEditing:: @ 85EC3A6
 gText_StopGivingPkmnMail:: @ 85EC3B4
 	.string "Stop giving the POKéMON MAIL?$"
 
-gUnknown_085EC3D2:: @ 85EC3D2
+gText_AndFillOutTheQuestionnaire:: @ 85EC3D2
 	.string "and fill out the questionnaire.$"
 
-gUnknown_085EC3F2:: @ 85EC3F2
+gText_LetsReplyToTheInterview:: @ 85EC3F2
 	.string "Let’s reply to the interview!$"
 
 gText_AllTextBeingEditedWill:: @ 85EC410
@@ -3056,7 +3056,7 @@ gText_OriginalSongWillBeUsed:: @ 85EC4E9
 gUnknown_085EC509:: @ 85EC509
 	.string "That’s trendy already!$"
 
-gText_CombineTwoWordsOrPhrases:: @ 85EC520
+gText_CombineTwoWordsOrPhrases3:: @ 85EC520
 	.string "Combine two words or phrases.$"
 
 gUnknown_085EC53E:: @ 85EC53E
@@ -3074,40 +3074,40 @@ gUnknown_085EC584:: @ 85EC584
 gUnknown_085EC594:: @ 85EC594
 	.string "Cancel the selection?$"
 
-gUnknown_085EC5AA:: @ 85EC5AA
+gText_Profile:: @ 85EC5AA
 	.string "PROFILE$"
 
-gUnknown_085EC5B2:: @ 85EC5B2
+gText_AtTheBattlesStart:: @ 85EC5B2
 	.string "At the battle’s start:$"
 
-gUnknown_085EC5C9:: @ 85EC5C9
+gText_UponWinningABattle:: @ 85EC5C9
 	.string "Upon winning a battle:$"
 
-gUnknown_085EC5E0:: @ 85EC5E0
+gText_UponLosingABattle:: @ 85EC5E0
 	.string "Upon losing a battle:$"
 
-gUnknown_085EC5F6:: @ 85EC5F6
+gText_TheBardsSong:: @ 85EC5F6
 	.string "The BARD’s Song$"
 
-gUnknown_085EC606:: @ 85EC606
+gText_WhatsHipAndHappening:: @ 85EC606
 	.string "What’s hip and happening?$"
 
-gUnknown_085EC620:: @ 85EC620
+gText_Interview:: @ 85EC620
 	.string "Interview$"
 
-gUnknown_085EC62A:: @ 85EC62A
+gText_GoodSaying:: @ 85EC62A
 	.string "Good saying$"
 
-gUnknown_085EC636:: @ 85EC636
+gText_FansQuestion:: @ 85EC636
 	.string "Fan’s question$"
 
 gUnknown_085EC645:: @ 85EC645
 	.string "クイズの こたえは？$" @ "kuizuno kotaeha?" ("The quiz's answer is?" in Japanese)
 
-gUnknown_085EC650:: @ 85EC650
+gText_ApprenticesPhrase:: @ 85EC650
 	.string "Apprentice’s phrase$"
 
-gUnknown_085EC664:: @ 85EC664
+gText_Questionnaire:: @ 85EC664
 	.string "QUESTIONNAIRE$"
 
 gText_YouCannotQuitHere:: @ 85EC672
@@ -3122,13 +3122,13 @@ gText_F700sQuiz:: @ 85EC6A8
 gText_Lady:: @ 85EC6B2
 	.string "Lady$"
 
-gUnknown_085EC6B7:: @ 85EC6B7
+gText_AfterYouHaveReadTheQuiz:: @ 85EC6B7
 	.string "After you have read the quiz$"
 
-gUnknown_085EC6D4:: @ 85EC6D4
+gText_QuestionPressTheAButton:: @ 85EC6D4
 	.string "question, press the A Button.$"
 
-gUnknown_085EC6F2:: @ 85EC6F2
+gText_TheQuizAnswerIs:: @ 85EC6F2
 	.string "The quiz answer is?$"
 
 gText_LikeToQuitQuiz:: @ 85EC706
@@ -3137,7 +3137,7 @@ gText_LikeToQuitQuiz:: @ 85EC706
 gText_ChallengeQuestionMark:: @ 85EC727
 	.string "challenge?$"
 
-gUnknown_085EC732:: @ 85EC732
+gText_IsThisQuizOK:: @ 85EC732
 	.string "Is this quiz OK?$"
 
 gText_CreateAQuiz:: @ 85EC743
@@ -5370,19 +5370,19 @@ gUnknown_085EFCA0:: @ 85EFCA0
 gUnknown_085EFCAB:: @ 85EFCAB
 	.string "SEAFLOOR2$"
 
-gUnknown_085EFCB5:: @ 85EFCB5
+gText_DelAll:: @ 85EFCB5
 	.string "DEL. ALL$"
 
-gUnknown_085EFCBE:: @ 85EFCBE
+gText_Cancel5:: @ 85EFCBE
 	.string "CANCEL$"
 
-gUnknown_085EFCC5:: @ 85EFCC5
+gText_Ok2:: @ 85EFCC5
 	.string "OK$"
 
-gUnknown_085EFCC8:: @ 85EFCC8
+gText_Quiz:: @ 85EFCC8
 	.string "QUIZ$"
 
-gUnknown_085EFCCD:: @ 85EFCCD
+gText_Answer:: @ 85EFCCD
 	.string "ANSWER$"
 
 gText_PokeBalls:: @ 85EFCD4