Merge branch 'master' into link

.travis.yml

@@ -0,0 +1,28 @@
+language: generic
+dist: trusty
+sudo: false
+env:
+  global:
+    - DEVKITARM=$HOME/devkitARM
+addons:
+  apt:
+    packages:
+      - gcc-multilib
+      - linux-libc-dev
+cache:
+  apt: true
+install:
+  - pushd $HOME
+  - travis_retry wget http://download.sourceforge.net/devkitpro/devkitARM_r46-x86_64-linux.tar.bz2
+  - tar xf devkitARM*.tar.bz2
+  - travis_retry git clone https://github.com/pret/agbcc.git
+  - cd agbcc && ./build.sh && ./install.sh $TRAVIS_BUILD_DIR
+  - popd
+
+matrix:
+  include:
+    - os: linux
+      env: _="Build"
+      script:
+        - ./build_tools.sh
+        - make -j2 compare

INSTALL.md

@@ -1,4 +1,4 @@
-First, you must put a Pokémon Emerald (US) ROM in the root directory of the repository and name it `baserom.gba`. It should have a SHA1 checksum of `f3ae088181bf583e55daf962a92bb46f4f1d07b7`. Then, follow the OS-specific instructions below.
+Follow the OS-specific instructions below.
 
 # Linux
 
@@ -8,12 +8,12 @@ Make sure that there is an environment variable called DEVKITARM with the path o
 
 Then get the compiler from https://github.com/pret/agbcc and run the following commands.
 
-	build.sh
+	./build.sh
-	install.sh PATH_OF_POKEEMERALD_DIRECTORY
+	./install.sh PATH_OF_POKEEMERALD_DIRECTORY
 
 Then in the pokeemerald directory, build the tools.
 
-	build_tools.sh
+	./build_tools.sh
 
 Finally, build the rom.
 

Makefile

@@ -168,5 +168,3 @@ $(ELF): $(OBJ_DIR)/ld_script.ld $(OBJS)
 $(ROM): $(ELF)
 	$(OBJCOPY) -O binary --gap-fill 0xFF --pad-to 0x9000000 $< $@
 
-baserom.gba: ;
-	$(error baserom.gba is required to build)

README.md

@@ -1,12 +1,14 @@
 # Pokémon Emerald
 
+[![Build Status][travis-badge]][travis]
+
 This is a disassembly of Pokémon Emerald.
 
 It builds the following rom:
 
 * pokeemerald.gba `sha1: f3ae088181bf583e55daf962a92bb46f4f1d07b7`
 
-To set up the repository, see [**INSTALL.md**](INSTALL.md).
+To set up the repository, see [INSTALL.md](INSTALL.md).
 
 
 ## See also
@@ -32,3 +34,5 @@ To set up the repository, see [**INSTALL.md**](INSTALL.md).
 [pokefirered]: https://github.com/pret/pokefirered
 [Discord]: https://discord.gg/cJxDDVP
 [irc]: https://kiwiirc.com/client/irc.freenode.net/?#pret
+[travis]: https://travis-ci.org/pret/pokeemerald
+[travis-badge]: https://travis-ci.org/pret/pokeemerald.svg?branch=master

asm/battle_anim_80FE840.s

@@ -18852,7 +18852,7 @@ _0810800C:
 	negs r0, r0
 	cmp r1, r0
 	bne _08108022
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	adds r0, r7, 0
 	bl DestroyTask
 _08108022:

asm/battle_frontier_1.s

@@ -9449,7 +9449,7 @@ _08193AA8:
 	b _08193BC2
 _08193ABA:
 	bl FreeAllWindowBuffers
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	ldr r4, =gUnknown_0203CD7C
 	ldr r0, [r4]
 	bl Free
@@ -9494,7 +9494,7 @@ _08193B20:
 	cmp r6, 0
 	bne _08193BC2
 	bl FreeAllWindowBuffers
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	ldr r4, =gUnknown_0203CD7C
 	ldr r0, [r4]
 	bl Free
@@ -9534,7 +9534,7 @@ _08193B84:
 	cmp r6, 0
 	bne _08193BC2
 	bl FreeAllWindowBuffers
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	ldr r4, =gUnknown_0203CD7C
 	ldr r0, [r4]
 	bl Free

asm/battle_frontier_2.s

@@ -18556,7 +18556,7 @@ _081A4202:
 	thumb_func_start sub_81A4224
 sub_81A4224: @ 81A4224
 	push {lr}
-	bl sub_81652B4
+	bl ValidateEReaderTrainer
 	pop {r0}
 	bx r0
 	thumb_func_end sub_81A4224

asm/battle_records.s

@@ -1034,7 +1034,7 @@ _0813C6FA:
 	thumb_func_start sub_813C80C
 sub_813C80C: @ 813C80C
 	push {lr}
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl ResetTasks
 	bl ResetSpriteData
 	bl ResetPaletteFade

asm/battle_tower.s

@@ -5898,8 +5898,8 @@ _08165294:
 	.pool
 	thumb_func_end GetEreaderTrainerName
 
-	thumb_func_start sub_81652B4
+	thumb_func_start ValidateEReaderTrainer
-sub_81652B4: @ 81652B4
+ValidateEReaderTrainer: @ 81652B4
 	push {r4-r6,lr}
 	ldr r2, =gSpecialVar_Result
 	movs r0, 0
@@ -5951,7 +5951,7 @@ _08165316:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_81652B4
+	thumb_func_end ValidateEReaderTrainer
 
 	thumb_func_start sub_8165328
 sub_8165328: @ 8165328

asm/berry_tag_screen.s

@@ -119,7 +119,7 @@ _08177D18:
 	bl clear_scheduled_bg_copies_to_vram
 	b _08177DDC
 _08177D26:
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	b _08177DDC
 _08177D2C:
 	bl ResetPaletteFade

asm/cable_car.s

@@ -88,7 +88,7 @@ _0814FD20:
 	bl SetVBlankCallback
 	movs r0, 0
 	bl sub_8150B6C
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	movs r3, 0xC0
 	lsls r3, 19
 	movs r4, 0xC0

asm/contest_painting.s

@@ -107,7 +107,7 @@ _0812FE80:
 	.4byte _0812FF2A
 	.4byte _0812FF54
 _0812FE94:
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	movs r0, 0
 	bl SetVBlankCallback
 	bl AllocateMonSpritesGfx

asm/field_screen.s

@@ -9621,7 +9621,7 @@ _080AFE64:
 	ldrsh r0, [r4, r3]
 	cmp r0, 0x1
 	bne _080AFEB4
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	movs r0, 0x2
 	strh r0, [r4]
 	b _080AFEC6
@@ -9714,7 +9714,7 @@ _080AFF28:
 	ldrsh r0, [r4, r3]
 	cmp r0, 0x1
 	bne _080AFF78
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	movs r0, 0x2
 	strh r0, [r4]
 	b _080AFF8A

asm/fldeff_cut.s

@@ -244,7 +244,7 @@ _080D38F8:
 	lsrs r4, r0, 16
 	movs r7, 0x1
 	movs r5, 0
-	ldr r3, =gUnknown_0857C60A
+	ldr r3, =gUnknown_0857C608 + 2
 	adds r0, r2, r3
 	ldrb r0, [r0]
 	adds r6, 0x1

asm/fossil_specials.s

@@ -657,7 +657,7 @@ _081BF0B4:
 	ldr r0, [r0]
 	ldr r1, [r0]
 	movs r5, 0
-	ldr r2, =gUnknown_08617C44
+	ldr r2, =gRootFossil_Gfx
 _081BF0BE:
 	adds r0, r5, r2
 	ldrb r0, [r0]

asm/hof_pc.s

@@ -1,73 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start AccessHallOfFamePC
-AccessHallOfFamePC: @ 8137C28
-	push {lr}
-	ldr r0, =CB2_DoHallOfFamePC
-	bl SetMainCallback2
-	bl ScriptContext2_Enable
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end AccessHallOfFamePC
-
-	thumb_func_start ReturnFromHallOfFamePC
-ReturnFromHallOfFamePC: @ 8137C3C
-	push {lr}
-	ldr r0, =c2_exit_to_overworld_2_switch
-	bl SetMainCallback2
-	ldr r1, =gFieldCallback
-	ldr r0, =ReshowPCMenuAfterHallOfFamePC
-	str r0, [r1]
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end ReturnFromHallOfFamePC
-
-	thumb_func_start ReshowPCMenuAfterHallOfFamePC
-ReshowPCMenuAfterHallOfFamePC: @ 8137C5C
-	push {lr}
-	sub sp, 0x4
-	bl ScriptContext2_Enable
-	bl Overworld_PlaySpecialMapMusic
-	bl sp109_CreatePCMenu
-	bl sub_80E2514
-	movs r0, 0x1
-	negs r0, r0
-	movs r1, 0
-	str r1, [sp]
-	movs r2, 0x10
-	movs r3, 0
-	bl BeginNormalPaletteFade
-	ldr r0, =Task_WaitForPaletteFade
-	movs r1, 0xA
-	bl CreateTask
-	add sp, 0x4
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end ReshowPCMenuAfterHallOfFamePC
-
-	thumb_func_start Task_WaitForPaletteFade
-Task_WaitForPaletteFade: @ 8137C94
-	push {lr}
-	lsls r0, 24
-	lsrs r2, r0, 24
-	ldr r0, =gPaletteFade
-	ldrb r1, [r0, 0x7]
-	movs r0, 0x80
-	ands r0, r1
-	cmp r0, 0
-	bne _08137CAC
-	adds r0, r2, 0
-	bl DestroyTask
-_08137CAC:
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end Task_WaitForPaletteFade

asm/intro.s

@@ -184,7 +184,7 @@ _0816CCF4:
 	movs r0, 0
 	movs r2, 0
 	bl load_copyright_graphics
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl ResetTasks
 	bl ResetSpriteData
 	bl FreeAllSpritePalettes

asm/item_menu.s

@@ -343,7 +343,7 @@ _081AAE34:
 	bl clear_scheduled_bg_copies_to_vram
 	b _081AB012
 _081AAE3E:
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	ldr r1, =gMain
 	movs r2, 0x87
 	lsls r2, 3

asm/macros/event.inc

@@ -262,6 +262,13 @@
 	.2byte \output
 	.2byte SPECIAL_\function
 	.endm
+	
+	@ temporary solution
+	.macro specialvar_ output, functionId
+	.byte 0x26
+	.2byte \output
+	.2byte \functionId
+	.endm
 
 	@ Blocks script execution until a command or ASM code manually unblocks it. Generally used with specific commands and specials. If this command runs, and a subsequent command or piece of ASM does not unblock state, the script will remain blocked indefinitely (essentially a hang).
 	.macro waitstate

asm/main_menu.s

@@ -127,7 +127,7 @@ InitMainMenu: @ 802F6F4
 	movs r1, 0xF0
 	movs r2, 0x20
 	bl LoadPalette
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl ResetTasks
 	bl ResetSpriteData
 	bl FreeAllSpritePalettes
@@ -1487,7 +1487,7 @@ _08030460:
 	ldr r0, =gMain
 	ldr r1, =CB2_ReinitMainMenu
 	str r1, [r0, 0x8]
-	ldr r0, =CB2_OptionsMenu
+	ldr r0, =CB2_InitOptionMenu
 	b _0803048A
 	.pool
 _08030478:
@@ -1929,7 +1929,7 @@ task_new_game_prof_birch_speech_1: @ 80307B0
 	movs r1, 0x1
 	movs r2, 0x10
 	bl LoadPalette
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl ResetSpriteData
 	bl FreeAllSpritePalettes
 	bl dp13_810BB8C
@@ -3708,7 +3708,7 @@ new_game_prof_birch_speech_part2_start: @ 8031678
 	strh r0, [r4, 0x16]
 	ldr r0, =0x0000ffc4
 	strh r0, [r4, 0x10]
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl ResetSpriteData
 	bl FreeAllSpritePalettes
 	bl dp13_810BB8C
@@ -4783,7 +4783,7 @@ LoadMainMenuWindowFrameTiles: @ 80320A4
 	ldr r0, [r6]
 	ldrb r0, [r0, 0x14]
 	lsrs r0, 3
-	bl sub_8098758
+	bl GetWindowFrameTilesPal
 	ldr r1, [r0]
 	movs r2, 0x90
 	lsls r2, 1
@@ -4793,7 +4793,7 @@ LoadMainMenuWindowFrameTiles: @ 80320A4
 	ldr r0, [r6]
 	ldrb r0, [r0, 0x14]
 	lsrs r0, 3
-	bl sub_8098758
+	bl GetWindowFrameTilesPal
 	ldr r0, [r0, 0x4]
 	movs r1, 0x20
 	movs r2, 0x20

asm/map_name_popup.s

@@ -518,7 +518,7 @@ _080D4C0A:
 	lsls r1, r4, 4
 	subs r1, r4
 	lsls r1, 6
-	ldr r2, =gUnknown_0857DD04
+	ldr r2, =gMapPopUp_Outline_Table
 	adds r1, r2
 	movs r2, 0x80
 	lsls r2, 3
@@ -541,7 +541,7 @@ _080D4C0A:
 	.pool
 _080D4C6C:
 	lsls r0, r4, 5
-	ldr r1, =gUnknown_0857F384
+	ldr r1, =gMapPopUp_Palette_Table
 	adds r0, r1
 	movs r1, 0xE0
 	movs r2, 0x20
@@ -550,7 +550,7 @@ _080D4C7A:
 	lsls r1, r4, 4
 	subs r1, r4
 	lsls r1, 6
-	ldr r0, =gUnknown_0857C684
+	ldr r0, =gMapPopUp_Table
 	adds r1, r0
 	movs r0, 0x50
 	str r0, [sp]

asm/mon_markings.s

@@ -21,7 +21,7 @@ sub_811F918: @ 811F918
 	ldr r0, [r0]
 	ldrb r0, [r0, 0x14]
 	lsrs r0, 3
-	bl sub_8098758
+	bl GetWindowFrameTilesPal
 	ldr r3, =gUnknown_0203A124
 	ldr r2, [r3]
 	ldr r1, [r0]

asm/mystery_event_menu.s

@@ -468,7 +468,7 @@ _08178D74:
 	bne _08178E58
 	ldr r5, =0x0201c000
 	adds r0, r5, 0
-	bl sub_81538A0
+	bl RunMysteryEventScript
 	adds r4, r0, 0
 	lsls r4, 16
 	lsrs r4, 16

asm/mystery_event_script.s

@@ -1,870 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.syntax unified
-
-	.text
-
-	thumb_func_start sub_81537CC
-sub_81537CC: @ 81537CC
-	push {r4,lr}
-	adds r4, r3, 0
-	lsls r0, 16
-	lsrs r0, 16
-	lsls r2, 16
-	lsrs r2, 16
-	movs r3, 0x1
-	ands r0, r3
-	cmp r0, 0
-	beq _081537FC
-	ands r1, r3
-	cmp r1, 0
-	beq _081537FC
-	movs r0, 0x4
-	ands r2, r0
-	cmp r2, 0
-	beq _081537FC
-	movs r0, 0x80
-	lsls r0, 2
-	ands r0, r4
-	cmp r0, 0
-	beq _081537FC
-	movs r0, 0x1
-	b _081537FE
-_081537FC:
-	movs r0, 0
-_081537FE:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_81537CC
-
-	thumb_func_start sub_8153804
-sub_8153804: @ 8153804
-	push {lr}
-	ldr r0, =gStringVar4
-	ldr r1, =gText_MysteryGiftCantBeUsed
-	bl StringExpandPlaceholders
-	movs r0, 0x3
-	bl SetMysteryEventScriptStatus
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8153804
-
-	thumb_func_start sub_8153820
-sub_8153820: @ 8153820
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	adds r5, r1, 0
-	ldr r1, =gUnknown_082DED2C
-	ldr r2, =gUnknown_082DED2C + 0x44
-	bl InitScriptContext
-	adds r0, r4, 0
-	adds r1, r5, 0
-	bl SetupBytecodeScript
-	str r5, [r4, 0x64]
-	movs r0, 0
-	str r0, [r4, 0x68]
-	str r0, [r4, 0x6C]
-	str r0, [r4, 0x70]
-	pop {r4,r5}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8153820
-
-	thumb_func_start sub_8153850
-sub_8153850: @ 8153850
-	push {r4,lr}
-	adds r4, r0, 0
-	bl RunScriptCommand
-	lsls r0, 24
-	cmp r0, 0
-	beq _08153868
-	ldr r0, [r4, 0x70]
-	cmp r0, 0
-	beq _08153868
-	movs r0, 0x1
-	b _0815386A
-_08153868:
-	movs r0, 0
-_0815386A:
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8153850
-
-	thumb_func_start sub_8153870
-sub_8153870: @ 8153870
-	push {lr}
-	adds r1, r0, 0
-	ldr r0, =gUnknown_0203BBC0
-	bl sub_8153820
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8153870
-
-	thumb_func_start sub_8153884
-sub_8153884: @ 8153884
-	push {r4,r5,lr}
-	adds r5, r0, 0
-	ldr r4, =gUnknown_0203BBC0
-	adds r0, r4, 0
-	bl sub_8153850
-	ldr r1, [r4, 0x6C]
-	str r1, [r5]
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_8153884
-
-	thumb_func_start sub_81538A0
-sub_81538A0: @ 81538A0
-	push {r4,lr}
-	adds r1, r0, 0
-	ldr r4, =gUnknown_0203BBC0
-	adds r0, r4, 0
-	bl sub_8153820
-_081538AC:
-	adds r0, r4, 0
-	bl sub_8153850
-	cmp r0, 0
-	bne _081538AC
-	ldr r0, [r4, 0x6C]
-	pop {r4}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_81538A0
-
-	thumb_func_start SetMysteryEventScriptStatus
-SetMysteryEventScriptStatus: @ 81538C4
-	ldr r1, =gUnknown_0203BBC0
-	str r0, [r1, 0x6C]
-	bx lr
-	.pool
-	thumb_func_end SetMysteryEventScriptStatus
-
-	thumb_func_start sub_81538D0
-sub_81538D0: @ 81538D0
-	push {lr}
-	movs r2, 0
-	ldr r0, =gSaveBlock1Ptr
-	ldr r0, [r0]
-	ldr r1, =0x00003b18
-	adds r3, r0, r1
-	movs r1, 0
-_081538DE:
-	adds r0, r3, r1
-	ldrb r0, [r0]
-	adds r2, r0
-	adds r1, 0x1
-	cmp r1, 0xB
-	bls _081538DE
-	adds r0, r2, 0
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_81538D0
-
-	thumb_func_start sub_81538F8
-sub_81538F8: @ 81538F8
-	push {r4,r5,lr}
-	ldr r5, =gSaveBlock1Ptr
-	ldr r0, [r5]
-	ldr r1, =0x00003b18
-	adds r4, r0, r1
-	bl sub_81538D0
-	adds r1, r0, 0
-	ldrb r0, [r4]
-	cmp r0, 0
-	beq _0815392A
-	ldrb r0, [r4, 0x1]
-	cmp r0, 0
-	beq _0815392A
-	ldrh r0, [r4, 0x2]
-	cmp r0, 0
-	beq _0815392A
-	cmp r1, 0
-	beq _0815392A
-	ldr r0, [r5]
-	ldr r2, =0x00003b14
-	adds r0, r2
-	ldr r0, [r0]
-	cmp r1, r0
-	beq _0815393C
-_0815392A:
-	movs r0, 0
-	b _0815393E
-	.pool
-_0815393C:
-	movs r0, 0x1
-_0815393E:
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_81538F8
-
-	thumb_func_start sub_8153944
-sub_8153944: @ 8153944
-	push {lr}
-	sub sp, 0x4
-	mov r1, sp
-	movs r0, 0
-	strh r0, [r1]
-	ldr r0, =gSaveBlock1Ptr
-	ldr r1, [r0]
-	ldr r0, =0x00003b14
-	adds r1, r0
-	ldr r2, =0x01000008
-	mov r0, sp
-	bl CpuSet
-	add sp, 0x4
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8153944
-
-	thumb_func_start sub_8153970
-sub_8153970: @ 8153970
-	push {r4-r6,lr}
-	lsls r0, 24
-	lsrs r0, 24
-	adds r3, r0, 0
-	lsls r1, 24
-	lsrs r1, 24
-	adds r5, r1, 0
-	lsls r2, 16
-	lsrs r2, 16
-	adds r6, r2, 0
-	cmp r3, 0
-	beq _08153990
-	cmp r1, 0
-	beq _08153990
-	cmp r2, 0
-	bne _08153996
-_08153990:
-	bl sub_8153944
-	b _081539BC
-_08153996:
-	ldr r4, =gSaveBlock1Ptr
-	ldr r0, [r4]
-	ldr r1, =0x00003b18
-	adds r0, r1
-	strb r3, [r0]
-	ldr r0, [r4]
-	ldr r2, =0x00003b19
-	adds r0, r2
-	strb r5, [r0]
-	ldr r0, [r4]
-	adds r1, 0x2
-	adds r0, r1
-	strh r6, [r0]
-	bl sub_81538D0
-	ldr r1, [r4]
-	ldr r2, =0x00003b14
-	adds r1, r2
-	str r0, [r1]
-_081539BC:
-	pop {r4-r6}
-	pop {r0}
-	bx r0
-	.pool
-	thumb_func_end sub_8153970
-
-	thumb_func_start sub_81539D4
-sub_81539D4: @ 81539D4
-	push {r4-r6,lr}
-	ldr r6, =gSaveBlock1Ptr
-	ldr r0, [r6]
-	ldr r1, =0x00003b18
-	adds r4, r0, r1
-	bl sub_81538F8
-	cmp r0, 0
-	bne _081539F8
-	bl sub_8153944
-	movs r0, 0
-	b _08153A1A
-	.pool
-_081539F8:
-	ldrh r5, [r4, 0x2]
-	ldrb r0, [r4, 0x1]
-	subs r0, 0x1
-	strb r0, [r4, 0x1]
-	lsls r0, 24
-	cmp r0, 0
-	bne _08153A0C
-	bl sub_8153944
-	b _08153A18
-_08153A0C:
-	bl sub_81538D0
-	ldr r1, [r6]
-	ldr r2, =0x00003b14
-	adds r1, r2
-	str r0, [r1]
-_08153A18:
-	adds r0, r5, 0
-_08153A1A:
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_81539D4
-
-	thumb_func_start script_status_stop_and_ret_1
-script_status_stop_and_ret_1: @ 8153A24
-	push {lr}
-	bl StopScript
-	movs r0, 0x1
-	pop {r1}
-	bx r1
-	thumb_func_end script_status_stop_and_ret_1
-
-	thumb_func_start sub_8153A30
-sub_8153A30: @ 8153A30
-	push {r4-r7,lr}
-	adds r7, r0, 0
-	bl ScriptReadWord
-	str r0, [r7, 0x68]
-	adds r0, r7, 0
-	bl ScriptReadHalfword
-	adds r5, r0, 0
-	lsls r5, 16
-	lsrs r5, 16
-	adds r0, r7, 0
-	bl ScriptReadWord
-	adds r6, r0, 0
-	adds r0, r7, 0
-	bl ScriptReadHalfword
-	adds r4, r0, 0
-	lsls r4, 16
-	lsrs r4, 16
-	adds r0, r7, 0
-	bl ScriptReadWord
-	adds r3, r0, 0
-	adds r0, r5, 0
-	adds r1, r6, 0
-	adds r2, r4, 0
-	bl sub_81537CC
-	cmp r0, 0x1
-	bne _08153A74
-	str r0, [r7, 0x70]
-	b _08153A78
-_08153A74:
-	bl sub_8153804
-_08153A78:
-	movs r0, 0x1
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8153A30
-
-	thumb_func_start sub_8153A80
-sub_8153A80: @ 8153A80
-	movs r0, 0
-	bx lr
-	thumb_func_end sub_8153A80
-
-	thumb_func_start sub_8153A84
-sub_8153A84: @ 8153A84
-	ldr r1, [r0, 0x8]
-	ldrb r2, [r1]
-	adds r1, 0x1
-	str r1, [r0, 0x8]
-	str r2, [r0, 0x6C]
-	movs r0, 0
-	bx lr
-	thumb_func_end sub_8153A84
-
-	thumb_func_start sub_8153A94
-sub_8153A94: @ 8153A94
-	push {r4,r5,lr}
-	adds r4, r0, 0
-	ldr r0, [r4, 0x8]
-	ldrb r5, [r0]
-	adds r0, 0x1
-	str r0, [r4, 0x8]
-	adds r0, r4, 0
-	bl ScriptReadWord
-	ldr r1, [r4, 0x68]
-	subs r0, r1
-	ldr r1, [r4, 0x64]
-	adds r1, r0, r1
-	cmp r5, 0xFF
-	beq _08153AB8
-	ldr r0, [r4, 0x6C]
-	cmp r5, r0
-	bne _08153ABE
-_08153AB8:
-	ldr r0, =gStringVar4
-	bl StringExpandPlaceholders
-_08153ABE:
-	movs r0, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_8153A94
-
-	thumb_func_start sub_8153ACC
-sub_8153ACC: @ 8153ACC
-	push {r4,lr}
-	adds r4, r0, 0
-	bl ScriptReadWord
-	ldr r1, [r4, 0x68]
-	subs r0, r1
-	ldr r1, [r4, 0x64]
-	adds r0, r1
-	bl ScriptContext2_RunNewScript
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8153ACC
-
-	thumb_func_start sub_8153AE8
-sub_8153AE8: @ 8153AE8
-	push {r4-r7,lr}
-	mov r7, r9
-	mov r6, r8
-	push {r6,r7}
-	adds r7, r0, 0
-	bl IsEnigmaBerryValid
-	mov r8, r0
-	adds r0, r7, 0
-	bl ScriptReadWord
-	adds r4, r0, 0
-	ldr r0, [r7, 0x68]
-	subs r4, r0
-	ldr r0, [r7, 0x64]
-	adds r4, r0
-	ldr r0, =gStringVar1
-	mov r9, r0
-	ldr r6, =gSaveBlock1Ptr
-	ldr r1, [r6]
-	ldr r5, =0x000031f8
-	adds r1, r5
-	movs r2, 0x7
-	bl StringCopyN
-	adds r0, r4, 0
-	bl SetEnigmaBerry
-	ldr r4, =gStringVar2
-	ldr r1, [r6]
-	adds r1, r5
-	adds r0, r4, 0
-	movs r2, 0x7
-	bl StringCopyN
-	mov r0, r8
-	cmp r0, 0
-	bne _08153B54
-	ldr r0, =gStringVar4
-	ldr r1, =gText_MysteryGiftBerry
-	b _08153B74
-	.pool
-_08153B54:
-	mov r0, r9
-	adds r1, r4, 0
-	bl StringCompare
-	cmp r0, 0
-	beq _08153B70
-	ldr r0, =gStringVar4
-	ldr r1, =gText_MysteryGiftBerryTransform
-	b _08153B74
-	.pool
-_08153B70:
-	ldr r0, =gStringVar4
-	ldr r1, =gText_MysteryGiftBerryObtained
-_08153B74:
-	bl StringExpandPlaceholders
-	movs r0, 0x2
-	str r0, [r7, 0x6C]
-	bl IsEnigmaBerryValid
-	cmp r0, 0x1
-	bne _08153B9C
-	ldr r0, =0x0000402d
-	movs r1, 0x1
-	bl VarSet
-	b _08153BA0
-	.pool
-_08153B9C:
-	movs r0, 0x1
-	str r0, [r7, 0x6C]
-_08153BA0:
-	movs r0, 0
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8153AE8
-
-	thumb_func_start sub_8153BB0
-sub_8153BB0: @ 8153BB0
-	push {r4,lr}
-	adds r4, r0, 0
-	ldr r2, [r4, 0x8]
-	ldrb r0, [r2]
-	adds r2, 0x1
-	str r2, [r4, 0x8]
-	ldrb r1, [r2]
-	adds r2, 0x1
-	str r2, [r4, 0x8]
-	bl GiveGiftRibbonToParty
-	ldr r0, =gStringVar4
-	ldr r1, =gText_MysteryGiftSpecialRibbon
-	bl StringExpandPlaceholders
-	movs r0, 0x2
-	str r0, [r4, 0x6C]
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_8153BB0
-
-	thumb_func_start sub_8153BE4
-sub_8153BE4: @ 8153BE4
-	push {r4-r6,lr}
-	mov r6, r9
-	mov r5, r8
-	push {r5,r6}
-	sub sp, 0x4
-	adds r4, r0, 0
-	ldr r0, [r4, 0x8]
-	ldrb r1, [r0]
-	mov r9, r1
-	adds r0, 0x1
-	str r0, [r4, 0x8]
-	ldrb r1, [r0]
-	mov r8, r1
-	adds r1, r0, 0x1
-	str r1, [r4, 0x8]
-	ldrb r6, [r0, 0x1]
-	adds r1, 0x1
-	str r1, [r4, 0x8]
-	adds r0, r4, 0
-	bl ScriptReadWord
-	adds r5, r0, 0
-	ldr r0, [r4, 0x68]
-	subs r5, r0
-	ldr r0, [r4, 0x64]
-	adds r5, r0
-	adds r0, r4, 0
-	bl ScriptReadWord
-	adds r1, r0, 0
-	ldr r0, [r4, 0x68]
-	subs r1, r0
-	ldr r0, [r4, 0x64]
-	adds r1, r0
-	subs r1, r5
-	lsls r1, 16
-	lsrs r1, 16
-	str r6, [sp]
-	adds r0, r5, 0
-	mov r2, r9
-	mov r3, r8
-	bl InitRamScript
-	movs r0, 0
-	add sp, 0x4
-	pop {r3,r4}
-	mov r8, r3
-	mov r9, r4
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8153BE4
-
-	thumb_func_start sub_8153C4C
-sub_8153C4C: @ 8153C4C
-	push {r4,lr}
-	adds r4, r0, 0
-	bl EnableNationalPokedex
-	ldr r0, =gStringVar4
-	ldr r1, =gText_MysteryGiftNationalDex
-	bl StringExpandPlaceholders
-	movs r0, 0x2
-	str r0, [r4, 0x6C]
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_8153C4C
-
-	thumb_func_start sub_8153C70
-sub_8153C70: @ 8153C70
-	push {r4,lr}
-	adds r4, r0, 0
-	ldr r1, [r4, 0x8]
-	ldrb r0, [r1]
-	adds r1, 0x1
-	str r1, [r4, 0x8]
-	bl sub_811EFC0
-	ldr r0, =gStringVar4
-	ldr r1, =gText_MysteryGiftRareWord
-	bl StringExpandPlaceholders
-	movs r0, 0x2
-	str r0, [r4, 0x6C]
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_8153C70
-
-	thumb_func_start sub_8153C9C
-sub_8153C9C: @ 8153C9C
-	push {r4,r5,lr}
-	ldr r1, [r0, 0x8]
-	ldrb r5, [r1]
-	adds r1, 0x1
-	str r1, [r0, 0x8]
-	ldrb r4, [r1]
-	adds r1, 0x1
-	str r1, [r0, 0x8]
-	bl ScriptReadHalfword
-	adds r2, r0, 0
-	lsls r2, 16
-	lsrs r2, 16
-	adds r0, r5, 0
-	adds r1, r4, 0
-	bl sub_8153970
-	movs r0, 0
-	pop {r4,r5}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8153C9C
-
-	thumb_func_start sub_8153CC8
-sub_8153CC8: @ 8153CC8
-	push {r4-r7,lr}
-	mov r7, r8
-	push {r7}
-	sub sp, 0x88
-	adds r6, r0, 0
-	bl ScriptReadWord
-	ldr r1, [r6, 0x68]
-	subs r0, r1
-	ldr r1, [r6, 0x64]
-	adds r5, r0, r1
-	movs r0, 0x64
-	adds r0, r5
-	mov r8, r0
-	add r4, sp, 0x24
-	adds r0, r4, 0
-	adds r1, r5, 0
-	movs r2, 0x64
-	bl memcpy
-	adds r0, r4, 0
-	movs r1, 0x41
-	bl GetMonData
-	lsls r0, 16
-	lsrs r4, r0, 16
-	movs r0, 0xCE
-	lsls r0, 1
-	cmp r4, r0
-	bne _08153D18
-	ldr r0, =gStringVar1
-	ldr r1, =gText_EggNickname
-	movs r2, 0xB
-	bl StringCopyN
-	b _08153D22
-	.pool
-_08153D18:
-	ldr r0, =gStringVar1
-	ldr r1, =gText_Pokemon
-	movs r2, 0xB
-	bl StringCopyN
-_08153D22:
-	ldr r0, =gPlayerPartyCount
-	ldrb r0, [r0]
-	cmp r0, 0x6
-	bne _08153D4C
-	ldr r0, =gStringVar4
-	ldr r1, =gText_MysteryGiftFullParty
-	bl StringExpandPlaceholders
-	movs r0, 0x3
-	b _08153DB6
-	.pool
-_08153D4C:
-	ldr r7, =gPlayerParty + 500
-	adds r0, r7, 0
-	adds r1, r5, 0
-	movs r2, 0x64
-	bl memcpy
-	mov r0, sp
-	mov r1, r8
-	movs r2, 0x24
-	bl memcpy
-	movs r0, 0xCE
-	lsls r0, 1
-	cmp r4, r0
-	beq _08153D86
-	adds r0, r4, 0
-	bl SpeciesToNationalPokedexNum
-	adds r4, r0, 0
-	lsls r4, 16
-	lsrs r4, 16
-	adds r0, r4, 0
-	movs r1, 0x2
-	bl GetSetPokedexFlag
-	adds r0, r4, 0
-	movs r1, 0x3
-	bl GetSetPokedexFlag
-_08153D86:
-	adds r0, r7, 0
-	movs r1, 0xC
-	bl GetMonData
-	lsls r0, 16
-	lsrs r0, 16
-	bl ItemIsMail
-	lsls r0, 24
-	cmp r0, 0
-	beq _08153DA4
-	adds r0, r7, 0
-	mov r1, sp
-	bl GiveMailToMon2
-_08153DA4:
-	bl CompactPartySlots
-	bl CalculatePlayerPartyCount
-	ldr r0, =gStringVar4
-	ldr r1, =gText_MysteryGiftSentOver
-	bl StringExpandPlaceholders
-	movs r0, 0x2
-_08153DB6:
-	str r0, [r6, 0x6C]
-	movs r0, 0
-	add sp, 0x88
-	pop {r3}
-	mov r8, r3
-	pop {r4-r7}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_8153CC8
-
-	thumb_func_start sub_8153DD4
-sub_8153DD4: @ 8153DD4
-	push {r4,lr}
-	adds r4, r0, 0
-	bl ScriptReadWord
-	adds r1, r0, 0
-	ldr r0, [r4, 0x68]
-	subs r1, r0
-	ldr r0, [r4, 0x64]
-	adds r1, r0
-	ldr r0, =gSaveBlock2Ptr
-	ldr r0, [r0]
-	ldr r2, =0x00000bec
-	adds r0, r2
-	movs r2, 0xBC
-	bl memcpy
-	bl sub_81652B4
-	ldr r0, =gStringVar4
-	ldr r1, =gText_MysteryGiftNewTrainer
-	bl StringExpandPlaceholders
-	movs r0, 0x2
-	str r0, [r4, 0x6C]
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_8153DD4
-
-	thumb_func_start sub_8153E1C
-sub_8153E1C: @ 8153E1C
-	push {r4,lr}
-	adds r4, r0, 0
-	bl EnableResetRTC
-	ldr r0, =gStringVar4
-	ldr r1, =gText_InGameClockUsable
-	bl StringExpandPlaceholders
-	movs r0, 0x2
-	str r0, [r4, 0x6C]
-	movs r0, 0
-	pop {r4}
-	pop {r1}
-	bx r1
-	.pool
-	thumb_func_end sub_8153E1C
-
-	thumb_func_start sub_8153E40
-sub_8153E40: @ 8153E40
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	bl ScriptReadWord
-	adds r5, r0, 0
-	adds r0, r6, 0
-	bl ScriptReadWord
-	adds r4, r0, 0
-	ldr r0, [r6, 0x68]
-	subs r4, r0
-	ldr r0, [r6, 0x64]
-	adds r4, r0
-	adds r0, r6, 0
-	bl ScriptReadWord
-	adds r1, r0, 0
-	ldr r0, [r6, 0x68]
-	subs r1, r0
-	ldr r0, [r6, 0x64]
-	adds r1, r0
-	subs r1, r4
-	adds r0, r4, 0
-	bl CalcByteArraySum
-	cmp r5, r0
-	beq _08153E7E
-	movs r0, 0
-	str r0, [r6, 0x70]
-	movs r0, 0x1
-	str r0, [r6, 0x6C]
-_08153E7E:
-	movs r0, 0x1
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8153E40
-
-	thumb_func_start sub_8153E88
-sub_8153E88: @ 8153E88
-	push {r4-r6,lr}
-	adds r6, r0, 0
-	bl ScriptReadWord
-	adds r5, r0, 0
-	adds r0, r6, 0
-	bl ScriptReadWord
-	adds r4, r0, 0
-	ldr r0, [r6, 0x68]
-	subs r4, r0
-	ldr r0, [r6, 0x64]
-	adds r4, r0
-	adds r0, r6, 0
-	bl ScriptReadWord
-	adds r1, r0, 0
-	ldr r0, [r6, 0x68]
-	subs r1, r0
-	ldr r0, [r6, 0x64]
-	adds r1, r0
-	subs r1, r4
-	adds r0, r4, 0
-	bl CalcCRC16
-	lsls r0, 16
-	lsrs r0, 16
-	cmp r5, r0
-	beq _08153ECA
-	movs r0, 0
-	str r0, [r6, 0x70]
-	movs r0, 0x1
-	str r0, [r6, 0x6C]
-_08153ECA:
-	movs r0, 0x1
-	pop {r4-r6}
-	pop {r1}
-	bx r1
-	thumb_func_end sub_8153E88
-
-	.align 2, 0 @ Don't pad with nop.

asm/overworld.s

@@ -4122,7 +4122,7 @@ sub_80867D8: @ 80867D8
 	movs r0, 0
 	movs r1, 0
 	bl SetGpuReg
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	ldr r2, =0x05000002
 	mov r1, sp
 	movs r0, 0

asm/party_menu.s

@@ -107,7 +107,7 @@ _081B0290:
 	b _081B048C
 	.pool
 _081B02AC:
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	b _081B0484
 _081B02B2:
 	bl ResetPaletteFade

asm/pokedex.s

@@ -379,7 +379,7 @@ _080BB582:
 	b _080BB74C
 	.pool
 _080BB5FC:
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl ResetTasks
 	bl ResetSpriteData
 	bl ResetPaletteFade

asm/pokemon_summary_screen.s

@@ -2239,7 +2239,7 @@ _081C50E4:
 	bl clear_scheduled_bg_copies_to_vram
 	b _081C51A2
 _081C50EE:
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	b _081C51A2
 _081C50F4:
 	bl FreeAllSpritePalettes

asm/pokenav.s

@@ -7095,7 +7095,7 @@ titlescreen_0: @ 81CA92C
 	movs r0, 0x44
 	movs r1, 0xA0
 	bl SetGpuRegBits
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl sub_81CAA3C
 	ldr r2, =gUnknown_08620384
 	ldr r0, [r2]
@@ -7122,7 +7122,7 @@ sub_81CA994: @ 81CA994
 	lsls r1, 6
 	movs r0, 0
 	bl ClearGpuRegBits
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	ldr r0, =sub_81CA9EC
 	bl FindTaskIdByFunc
 	lsls r0, 24

asm/rayquaza_scene.s

@@ -45,7 +45,7 @@ sub_81D6774: @ 81D6774
 	push {lr}
 	bl SetVBlankHBlankCallbacksToNull
 	bl clear_scheduled_bg_copies_to_vram
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl FreeAllSpritePalettes
 	bl ResetPaletteFade
 	bl ResetSpriteData
@@ -1522,7 +1522,7 @@ _081D73D8:
 	adds r0, r2
 	ldrh r1, [r4, 0x6]
 	strh r1, [r0, 0xE]
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 _081D7428:
 	ldrh r0, [r4]
 	adds r0, 0x1
@@ -1774,7 +1774,7 @@ sub_81D7600: @ 81D7600
 	bl ChangeBgY
 	movs r0, 0
 	bl SetVBlankCallback
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl ResetSpriteData
 	bl FreeAllSpritePalettes
 	strh r4, [r5]

asm/record_mixing.s

@@ -114,7 +114,7 @@ sub_80E6CA0: @ 80E6CA0
 	lsls r0, 24
 	cmp r0, 0
 	bne _080E6D1C
-	bl sub_81539D4
+	bl GetRecordMixingGift
 	ldr r2, =0x000011c8
 	adds r1, r5, r2
 	strh r0, [r1]
@@ -186,7 +186,7 @@ sub_80E6D54: @ 80E6D54
 	lsls r0, 24
 	cmp r0, 0
 	bne _080E6DEE
-	bl sub_81539D4
+	bl GetRecordMixingGift
 	ldr r2, =0x000011c8
 	adds r1, r5, r2
 	strh r0, [r1]
@@ -282,7 +282,7 @@ _080E6E60:
 	lsls r0, 24
 	cmp r0, 0
 	bne _080E6EFA
-	bl sub_81539D4
+	bl GetRecordMixingGift
 	ldr r1, [r5]
 	ldr r2, =0x00001210
 	adds r1, r2

asm/reset_rtc_screen.s

@@ -887,7 +887,7 @@ _0809EFCA:
 	movs r1, 0x80
 	bl ResetOamRange
 	bl LoadOam
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl dp12_8087EA4
 	bl ResetSpriteData
 	bl ResetTasks

asm/rom_8011DC0.s

@@ -10876,7 +10876,7 @@ _08018482:
 	bl ResetSpriteData
 	bl FreeAllSpritePalettes
 	bl ResetTasks
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	movs r0, 0
 	bl ResetBgsAndClearDma3BusyFlags
 	ldr r1, =gUnknown_082F0598
@@ -14859,7 +14859,7 @@ sub_801A43C: @ 801A43C
 	bl ResetPaletteFade
 	bl ResetSpriteData
 	bl ResetTasks
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl m4aSoundVSyncOn
 	ldr r0, =sub_801A418
 	bl SetVBlankCallback
@@ -21107,7 +21107,7 @@ _0801D7D0:
 	ldr r1, [r4, 0x18]
 	movs r2, 0xBC
 	bl memcpy
-	bl sub_81652B4
+	bl ValidateEReaderTrainer
 	b _0801D804
 	.pool
 _0801D7F0:
@@ -28238,7 +28238,7 @@ _080210A0:
 	movs r0, 0
 	movs r1, 0
 	bl SetGpuReg
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl reset_temp_tile_data_buffers
 	b _080212FC
 _080210BE:
@@ -44190,7 +44190,7 @@ sub_8028FF8: @ 8028FF8
 	lsls r4, 24
 	lsrs r4, 24
 	adds r0, r4, 0
-	bl sub_8098758
+	bl GetWindowFrameTilesPal
 	ldr r1, [r0]
 	movs r2, 0x90
 	lsls r2, 1
@@ -44198,7 +44198,7 @@ sub_8028FF8: @ 8028FF8
 	movs r3, 0x1
 	bl LoadBgTiles
 	adds r0, r4, 0
-	bl sub_8098758
+	bl GetWindowFrameTilesPal
 	ldr r0, [r0, 0x4]
 	movs r1, 0xA0
 	movs r2, 0x20

asm/roulette.s

@@ -423,7 +423,7 @@ _081405F4:
 _08140618:
 	movs r0, 0
 	bl SetVBlankCallback
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl SetVBlankHBlankCallbacksToNull
 	bl ResetVramOamAndBgCntRegs
 	bl ResetAllBgsCoordinates

asm/script_menu.s

@@ -676,9 +676,9 @@ _080E2360:
 	.pool
 	thumb_func_end sub_80E2308
 
-	thumb_func_start sp109_CreatePCMenu
+	thumb_func_start ScrSpecial_CreatePCMenu
-@ bool sp109_CreatePCMenu()
+@ bool ScrSpecial_CreatePCMenu()
-sp109_CreatePCMenu: @ 80E236C
+ScrSpecial_CreatePCMenu: @ 80E236C
 	push {lr}
 	ldr r0, =sub_80E2058
 	bl FuncIsActiveTask
@@ -698,7 +698,7 @@ _080E2394:
 _080E2396:
 	pop {r1}
 	bx r1
-	thumb_func_end sp109_CreatePCMenu
+	thumb_func_end ScrSpecial_CreatePCMenu
 
 	thumb_func_start CreatePCMenu
 CreatePCMenu: @ 80E239C
@@ -858,8 +858,8 @@ _080E24C6:
 	.pool
 	thumb_func_end CreatePCMenu
 
-	thumb_func_start sub_80E2514
+	thumb_func_start ScriptMenu_DisplayPCStartupPrompt
-sub_80E2514: @ 80E2514
+ScriptMenu_DisplayPCStartupPrompt: @ 80E2514
 	push {lr}
 	sub sp, 0x10
 	movs r0, 0
@@ -882,7 +882,7 @@ sub_80E2514: @ 80E2514
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end sub_80E2514
+	thumb_func_end ScriptMenu_DisplayPCStartupPrompt
 
 	thumb_func_start sub_80E2548
 sub_80E2548: @ 80E2548

asm/shop.s

@@ -448,7 +448,7 @@ _080DFE20:
 	ldr r2, =0x01000100
 	add r0, sp, 0x8
 	bl CpuFastSet
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl reset_temp_tile_data_buffers
 	bl FreeAllSpritePalettes
 	bl ResetPaletteFade

asm/start_menu.s

@@ -653,7 +653,7 @@ _0809FD38:
 	bl play_some_sound
 	bl RemoveExtraStartMenuWindows
 	bl overworld_free_bg_tilemaps
-	ldr r0, =CB2_OptionsMenu
+	ldr r0, =CB2_InitOptionMenu
 	bl SetMainCallback2
 	ldr r1, =gMain
 	ldr r0, =sub_8086194
@@ -1510,7 +1510,7 @@ _080A0418:
 	bl SetGpuReg
 	movs r0, 0
 	bl SetVBlankCallback
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	movs r2, 0xA0
 	lsls r2, 19
 	mov r1, sp

asm/title_screen.s

@@ -614,7 +614,7 @@ _080AA8C4:
 	ldr r0, =gUnknown_08DDE458
 	ldr r1, =0x0600d800
 	bl LZ77UnCompVram
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl ResetTasks
 	bl ResetSpriteData
 	bl FreeAllSpritePalettes

asm/trainer_card.s

@@ -1556,7 +1556,7 @@ sub_80C3404: @ 80C3404
 sub_80C3414: @ 80C3414
 	push {lr}
 	bl ResetTasks
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	ldr r0, =sub_80C2760
 	movs r1, 0
 	bl CreateTask
@@ -3976,7 +3976,7 @@ sub_80C4998: @ 80C4998
 	bl HideBg
 	movs r0, 0x3
 	bl HideBg
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl dp12_8087EA4
 	movs r1, 0
 	ldr r0, =gUnknown_02038C28
@@ -5310,7 +5310,7 @@ _080C54AC:
 _080C54D8:
 	movs r0, 0
 	bl SetVBlankCallback
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl SetVBlankHBlankCallbacksToNull
 	movs r0, 0x2
 	bl DisableInterrupts
@@ -5594,7 +5594,7 @@ _080C577C:
 	bl HideBg
 	movs r0, 0
 	bl SetVBlankCallback
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl SetVBlankHBlankCallbacksToNull
 	b _080C57E4
 _080C57A6:
@@ -7189,7 +7189,7 @@ _080C64F0:
 _080C6510:
 	movs r0, 0
 	bl SetVBlankCallback
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl SetVBlankHBlankCallbacksToNull
 	b _080C6694
 _080C6520:
@@ -7400,7 +7400,7 @@ _080C66FC:
 _080C6722:
 	movs r0, 0
 	bl SetVBlankCallback
-	bl remove_some_task
+	bl ScanlineEffect_Stop
 	bl SetVBlankHBlankCallbacksToNull
 	b _080C67A4
 _080C6732:

asm/unknown_task.s

@@ -5,8 +5,8 @@
 
 	.text
 
-	thumb_func_start remove_some_task
+	thumb_func_start ScanlineEffect_Stop
-remove_some_task: @ 80B9FB8
+ScanlineEffect_Stop: @ 80B9FB8
 	push {r4,lr}
 	ldr r4, =gUnknown_02039B28
 	movs r0, 0
@@ -32,7 +32,7 @@ _080B9FE2:
 	pop {r0}
 	bx r0
 	.pool
-	thumb_func_end remove_some_task
+	thumb_func_end ScanlineEffect_Stop
 
 	thumb_func_start dp12_8087EA4
 dp12_8087EA4: @ 80B9FF8

build_tools.sh

@@ -1,8 +1,8 @@
 #!/bin/sh
-make -C tools/gbagfx CXX=${1:=g++}
+make -C tools/gbagfx CXX=${1:-g++}
-make -C tools/scaninc CXX=${1:=g++}
+make -C tools/scaninc CXX=${1:-g++}
-make -C tools/preproc CXX=${1:=g++}
+make -C tools/preproc CXX=${1:-g++}
-make -C tools/bin2c CXX=${1:=g++}
+make -C tools/bin2c CXX=${1:-g++}
-make -C tools/rsfont CXX=${1:=g++}
+make -C tools/rsfont CXX=${1:-g++}
-make -C tools/aif2pcm CXX=${1:=g++}
+make -C tools/aif2pcm CXX=${1:-g++}
-make -C tools/ramscrgen CXX=${1:=g++}
+make -C tools/ramscrgen CXX=${1:-g++}

data/battle_frontier_2.s

@@ -373,7 +373,166 @@ gUnknown_08610948:: @ 8610948
 
 	.align 2 @ struct, eight bytes x6 for names in different languages, then 0x28 more bytes of data
 gUnknown_08610970:: @ 8610970
-	.incbin "baserom.gba", 0x610970, 0x580
+	.string "サダヒロ$", 8
+	.string "ALANN$", 8
+	.string "ALAIN$", 8
+	.string "ADELFO$", 8
+	.string "CLAUS$", 8
+	.string "TEO$", 8
+	.byte 0xC9, 0xBD
+	.2byte 0x43
+	.2byte SPECIES_BEAUTIFLY, SPECIES_DUSTOX, SPECIES_ILLUMISE, SPECIES_SHIFTRY, SPECIES_BRELOOM, SPECIES_NINJASK, SPECIES_SHEDINJA, SPECIES_PINSIR, SPECIES_HERACROSS, SPECIES_VOLBEAT, 0
+	.byte 0x1D, 8, 0x3e, 20, 0, 12, 1, 10, 0x30, 6, 0x44, 20, 0, 0
+	.string "ヒロオ$", 8
+	.string "LIONEL$", 8
+	.string "LIONEL$", 8
+	.string "CAIO$", 8
+	.string "LUDWIG$", 8
+	.string "LEO$", 8
+	.byte 0x9, 0xCF
+	.2byte 0x2B
+	.2byte SPECIES_SWELLOW, SPECIES_SWALOT, SPECIES_SHUCKLE, SPECIES_MANECTRIC, SPECIES_TORKOAL, SPECIES_HARIYAMA, SPECIES_MIGHTYENA, SPECIES_LUDICOLO, SPECIES_CRAWDAUNT, SPECIES_WHISCASH, 1
+	.byte 0x38, 12, 1, 10, 0x30, 6, 6, 10, 0x20, 0x10, 0x13, 0x22, 0, 0
+	.string "ケイジ$", 8
+	.string "SONNY$", 8
+	.string "HERVE$", 8
+	.string "FEDRO$", 8
+	.string "WENZEL$", 8
+	.string "SANTI$", 8
+	.byte 0x34, 0x2E
+	.2byte 0x26
+	.2byte SPECIES_LINOONE, SPECIES_MIGHTYENA, SPECIES_WHISCASH, SPECIES_ZANGOOSE, SPECIES_SEVIPER, SPECIES_NINETALES, SPECIES_KECLEON, SPECIES_SHUCKLE, SPECIES_MANECTRIC, SPECIES_MACHAMP, 2
+	.byte 1, 10, 10, 0x16, 0x15, 14, 0x30, 6, 0x3b, 12, 0x4, 12, 0, 0
+	.string "ユラ$", 8
+	.string "LAYLA$", 8
+	.string "LAYLA$", 8
+	.string "ASTRID$", 8
+	.string "SONJA$", 8
+	.string "LOLA$", 8
+	.byte 0xEF, 0x84
+	.2byte 0x47
+	.2byte SPECIES_SWALOT, SPECIES_XATU, SPECIES_ALTARIA, SPECIES_GOLDUCK, SPECIES_FLYGON, SPECIES_ALAKAZAM, SPECIES_GARDEVOIR, SPECIES_WAILORD, SPECIES_GRUMPIG, SPECIES_MIGHTYENA, 3
+	.byte 11, 16, 15, 0x1e, 0x39, 16, 0x21, 0x14, 0x3, 12, 0xff, 0xff, 0, 0
+	.string "ヨウカ$", 8
+	.string "MACY$", 8
+	.string "AMELIE$", 8
+	.string "CLEO$", 8
+	.string "MARIA$", 8
+	.string "ELISA$", 8
+	.byte 0x43, 0x1E
+	.2byte 0x27
+	.2byte SPECIES_WIGGLYTUFF, SPECIES_LINOONE, SPECIES_KINGDRA, SPECIES_DELCATTY, SPECIES_RAICHU, SPECIES_FEAROW, SPECIES_STARMIE, SPECIES_MEDICHAM, SPECIES_SHIFTRY, SPECIES_BEAUTIFLY, 4
+	.byte 15, 0x1e, 0x14, 16, 6, 16, 15, 0x28, 0x1c, 0x1c, 0x13, 0x1c, 0, 0
+	.string "ヤスシ$", 8
+	.string "DONTE$", 8
+	.string "BRAHIM$", 8
+	.string "GLAUCO$", 8
+	.string "JOSEF$", 8
+	.string "ROQUE$", 8
+	.byte 0x9F, 0x37
+	.2byte 0x30
+	.2byte SPECIES_STARMIE, SPECIES_DODRIO, SPECIES_AGGRON, SPECIES_MAGNETON, SPECIES_MACHAMP, SPECIES_ARMALDO, SPECIES_HERACROSS, SPECIES_NOSEPASS, SPECIES_EXPLOUD, SPECIES_MIGHTYENA, 5
+	.byte 0x29, 0x0A, 0x08, 0x14, 0x2F, 0x10, 0x38, 0x16, 0x20, 0x08, 0x00, 0x0C, 0x00, 0
+	.string "ミサオ$", 8
+	.string "AMIRA$", 8
+	.string "LAURE$", 8
+	.string "DAFNE$", 8
+	.string "AMELIE$", 8
+	.string "LARA$", 8
+	.byte 0x55, 0xF5
+	.2byte 0x31
+	.2byte SPECIES_STARMIE, SPECIES_DODRIO, SPECIES_MAGNETON, SPECIES_MEDICHAM, SPECIES_MIGHTYENA, SPECIES_GLALIE, SPECIES_GOLEM, SPECIES_ELECTRODE, SPECIES_PELIPPER, SPECIES_SHARPEDO, 6
+	.byte 0x0B, 0x0C, 0x3E, 0x12, 0x00, 0x0C, 0x31, 0x0A, 0x30, 0x14, 0x00, 0x0C, 0x00, 0x00
+	.string "カズサ$", 8
+	.string "KALI$", 8
+	.string "JODIE$", 8
+	.string "ILENIA$", 8
+	.string "KARO$", 8
+	.string "ELSA$", 8
+	.byte 0x26, 0x8D
+	.2byte 0x14
+	.2byte SPECIES_NINETALES, SPECIES_ALAKAZAM, SPECIES_SCEPTILE, SPECIES_SALAMENCE, SPECIES_GOLDUCK, SPECIES_MAWILE, SPECIES_WEEZING, SPECIES_LANTURN, SPECIES_GARDEVOIR, SPECIES_MILOTIC, 7
+	.byte 0x06, 0x0A, 0x20, 0x06, 0x1F, 0x0A, 0x02, 0x0A, 0x03, 0x0C, 0xFF, 0xFF, 0x00, 0x00
+	.string "スミレ$", 8
+	.string "ANNIE$", 8
+	.string "ANNIE$", 8
+	.string "IMELDA$", 8
+	.string "INES$", 8
+	.string "ROSA$", 8
+	.byte 0xC, 0x80
+	.2byte 0xD
+	.2byte SPECIES_SCEPTILE, SPECIES_VILEPLUME, SPECIES_BELLOSSOM, SPECIES_ROSELIA, SPECIES_CORSOLA, SPECIES_FLYGON, SPECIES_BRELOOM, SPECIES_MILOTIC, SPECIES_ALTARIA, SPECIES_CRADILY, 8
+	.byte 0x22, 0x1E, 0x33, 0x04, 0x0E, 0x02, 0x02, 0x0A, 0x1E, 0x10, 0x00, 0x0C, 0x00, 0x00
+	.string "アキノリ$", 8
+	.string "DILLEN$", 8
+	.string "RENE$", 8
+	.string "INDRO$", 8
+	.string "DETLEF$", 8
+	.string "PEDRO$", 8
+	.byte 0x9f, 0x46
+	.2byte 0
+	.2byte SPECIES_SKARMORY, SPECIES_GOLEM, SPECIES_BLAZIKEN, SPECIES_CAMERUPT, SPECIES_DONPHAN, SPECIES_MUK, SPECIES_SALAMENCE, SPECIES_TROPIUS, SPECIES_SOLROCK, SPECIES_RHYDON, 9
+	.byte 0x3D, 0x0A, 0x11, 0x10, 0x1E, 0x0E, 0x1C, 0x20, 0x04, 0x0C, 0xFF, 0xFF, 0x00, 0x00
+	.string "トウゾウ$", 8
+	.string "DALLAS$", 8
+	.string "BRUNO$", 8
+	.string "LEARCO$", 8
+	.string "ANSGAR$", 8
+	.string "MANOLO$", 8
+	.byte 0xFC, 0x71
+	.2byte 0x2D 
+	.2byte SPECIES_SEAKING, SPECIES_STARMIE, SPECIES_GOLDUCK, SPECIES_TENTACRUEL, SPECIES_OCTILLERY, SPECIES_GOREBYSS, SPECIES_GLALIE, SPECIES_WAILORD, SPECIES_SHARPEDO, SPECIES_KINGDRA, 10
+	.byte 0x05, 0x0A, 0x06, 0x06, 0x0E, 0x16, 0x14, 0x0A, 0x00, 0x0C, 0xFF, 0xFF, 0x00, 0x00
+	.string "セイヤ$", 8
+	.string "FRANK$", 8
+	.string "FRANK$", 8
+	.string "OLINDO$", 8
+	.string "FRANK$", 8
+	.string "MAURO$", 8
+	.byte 0x9E, 0xA3
+	.2byte 0x3A
+	.2byte SPECIES_QUAGSIRE, SPECIES_STARMIE, SPECIES_PELIPPER, SPECIES_CRAWDAUNT, SPECIES_WAILORD, SPECIES_GYARADOS, SPECIES_SWAMPERT, SPECIES_LANTURN, SPECIES_WHISCASH, SPECIES_SHUCKLE, 11
+	.byte 0x0E, 0x28, 0x3D, 0x10, 0x0F, 0x24, 0x14, 0x0A, 0x23, 0x1E, 0x24, 0x10, 0x00, 0x00
+	.string "リュウジ$", 8
+	.string "LAMONT$", 8
+	.string "XAV$", 8
+	.string "ORFEO$", 8
+	.string "J{0xf3}RGEN$", 8 @accent?
+	.string "JORGE$", 8
+	.byte 0x90, 0xE5
+	.2byte 0x19
+	.2byte SPECIES_ABSOL, SPECIES_CROBAT, SPECIES_EXPLOUD, SPECIES_MAGNETON, SPECIES_SHARPEDO, SPECIES_MANECTRIC, SPECIES_METAGROSS, SPECIES_ELECTRODE, SPECIES_NOSEPASS, SPECIES_WEEZING, 12
+	.byte 0x20, 0x10, 0x2E, 0x06, 0x0B, 0x10, 0x22, 0x1E, 0x0F, 0x1E, 0x0B, 0x10, 0x00, 0x00
+	.string "カツアキ$", 8
+	.string "TYRESE$", 8
+	.string "ANDY$", 8
+	.string "PARIDE$", 8
+	.string "DAVID$", 8
+	.string "CHICHO$", 8
+	.byte 0x18, 0xD0
+	.2byte 10
+	.2byte SPECIES_BLAZIKEN, SPECIES_GOLEM, SPECIES_MACHAMP, SPECIES_RHYDON, SPECIES_HARIYAMA, SPECIES_AGGRON, SPECIES_MEDICHAM, SPECIES_ZANGOOSE, SPECIES_VIGOROTH, SPECIES_SLAKING, 13
+	.byte 0x29, 0x0A, 0x3A, 0x06, 0x15, 0x0E, 0x35, 0x14, 0x34, 0x10, 0x1E, 0x06, 0x00, 0x00
+	.string "トシミツ$", 8
+	.string "DANTE$", 8
+	.string "DANTE$", 8
+	.string "RAOUL$", 8
+	.string "LOTHAR$", 8
+	.string "PABLO$", 8
+	.byte 0x75, 0xBC
+	.2byte 14
+	.2byte SPECIES_SCEPTILE, SPECIES_SANDSLASH, SPECIES_FLYGON, SPECIES_CLAYDOL, SPECIES_ARMALDO, SPECIES_CROBAT, SPECIES_CRADILY, SPECIES_SOLROCK, SPECIES_LUNATONE, SPECIES_GOLEM, 14
+	.byte 0x01, 0x0A, 0x17, 0x10, 0x43, 0x12, 0x22, 0x1E, 0x0B, 0x10, 0x0F, 0x28, 0x00, 0x00
+	.string "ローウェン$", 8
+	.string "ARTURO$", 8
+	.string "ARTURO$", 8
+	.string "ROMOLO$", 8
+	.string "BRIAN$", 8
+	.string "ARTURO$", 8
+	.byte 0x2, 0xFA
+	.2byte 0x20
+	.2byte SPECIES_ABSOL, SPECIES_MIGHTYENA, SPECIES_ALAKAZAM, SPECIES_BANETTE, SPECIES_NINETALES, SPECIES_CLAYDOL, SPECIES_MUK, SPECIES_SALAMENCE, SPECIES_WALREIN, SPECIES_DUSCLOPS, 15
+	.byte 0x0F, 0x1E, 0x04, 0x14, 0x2F, 0x10, 0x06, 0x10, 0x20, 0x10, 0x03, 0x0E, 0x00, 0x00
 
 	.align 2
 gUnknown_08610EF0:: @ 8610EF0

data/contest.s

@@ -1,5 +1,7 @@
     .include "asm/macros.inc"
     .include "constants/constants.inc"
+	.include "constants/species_constants.inc"
+	.include "include/constants/moves.h"
 
     .section .rodata
     .align 2, 0
@@ -299,11 +301,59 @@ gUnknown_08587F44:: @ 8587F44
 
 	.align 2
 gUnknown_08587FA4:: @ 8587FA4
-	.incbin "baserom.gba", 0x587fa4, 0x100
+	.4byte NULL, 0xFFFF
+	.2byte SPECIES_ELECTRIKE
+	.byte 2
+	.string "ELECTER$", 11
+	.string "EZRA$", 8
+	.2byte 0
+	.4byte NULL, 0xFFFF
+	.2byte SPECIES_TROPIUS
+	.byte 0
+	.string "TROPO$", 11
+	.string "ALLAN$", 8
+	.2byte 2
+	.4byte NULL, 0xFFFF
+	.2byte SPECIES_XATU
+	.byte 1
+	.string "TUXA$", 11
+	.string "JULIET$", 8
+	.2byte 0
+	.4byte NULL, 0xFFFF
+	.2byte SPECIES_PLUSLE
+	.byte 4
+	.string "PULSE$", 11
+	.string "BAILY$", 8
+	.2byte 3
+	.4byte NULL, 0xFFFF
+	.2byte SPECIES_SHUPPET
+	.byte 3
+	.string "SHUPUP$", 11
+	.string "MELANY$", 8
+	.2byte 1
+	.4byte NULL, 0xFFFF
+	.2byte SPECIES_ZANGOOSE
+	.byte 0
+	.string "GOOZAN$", 11
+	.string "HANA$", 8
+	.2byte 2
+	.4byte NULL, 0xFFFF
+	.2byte SPECIES_LOUDRED
+	.byte 1
+	.string "LOUDED$", 11
+	.string "BRYANT$", 8
+	.2byte 2
+	.4byte NULL, 0xFFFF
+	.2byte SPECIES_DELCATTY
+	.byte 2
+	.string "KITSY$", 11
+	.string "OMAR$", 8
+	.2byte 3
+	
 
 	.align 2
 gUnknown_085880A4:: @ 85880A4
-	.incbin "baserom.gba", 0x5880a4, 0x1800
+	.include "data/contest_opponents.inc"
 
 gUnknown_085898A4:: @ 85898A4
 	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

data/event_scripts.s

@@ -7,6 +7,7 @@
 	.include "asm/macros.inc"
 	.include "asm/macros/event.inc"
 	.include "constants/constants.inc"
+	
 
 	.section script_data, "aw", %progbits
 
@@ -1770,7 +1771,7 @@ EventScript_271D92:: @ 8271D92
 EventScript_271DAC:: @ 8271DAC
 	message gUnknown_0827266F
 	waitmessage
-	special sp109_CreatePCMenu
+	special ScrSpecial_CreatePCMenu
 	waitstate
 	goto EventScript_271DBC
 	end

data/field_effect_helpers.s

@@ -4,7 +4,7 @@
 	.section .rodata
 
 gUnknown_085CDC38:: @ 85CDC38
-	.incbin "baserom.gba", 0x5cdc38, 0x6
+	.2byte 12, 28, 44
 
 gUnknown_085CDC3E:: @ 85CDC3E
 	.byte 0x00, 0x01, 0x02, 0x03
@@ -22,8 +22,11 @@ gUnknown_085CDC54:: @ 85CDC54
 	.4byte sub_815550C
 
 gUnknown_085CDC60:: @ 85CDC60
-	.incbin "baserom.gba", 0x5cdc60, 0xa
+	.byte 0, 0, 1, 2, 3, 0, 0, 1, 1
-
+	.byte 0
+	
 gUnknown_085CDC6A:: @ 85CDC6A
-	.incbin "baserom.gba", 0x5cdc6a, 0x96
+	.2byte 3, 7
+	@the following might be unref, not sure
+	.byte 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x02, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0x00, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0x00, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFE, 0x00, 0x00
 

data/field_ground_effect.s

@@ -39,7 +39,8 @@ gUnknown_0850E654:: @ 850E654
 	.4byte DoTracksGroundEffect_BikeTireTracks
 
 gUnknown_0850E660:: @ 850E660
-	.incbin "baserom.gba", 0x50e660, 0x4
+	.byte 13, 0
+	.byte 24, 0
 
 gUnknown_0850E664:: @ 850E664
 	.byte 0x01, 0x02, 0x07, 0x08, 0x01, 0x02, 0x06, 0x05, 0x05, 0x08, 0x03, 0x04, 0x06, 0x07, 0x03, 0x04

data/field_player_avatar.s

@@ -115,11 +115,12 @@ gUnknown_08497540:: @ 8497540
 	.4byte sub_808C6FC
 
 gUnknown_08497550:: @ 8497550
-	.incbin "baserom.gba", 0x497550, 0x4
+	.byte 3, 4, 2, 1
 
 gUnknown_08497554:: @ 8497554
-	.incbin "baserom.gba", 0x497554, 0x8
+	.byte 16, 16, 17, 18, 19
 
+	.align 2
 gUnknown_0849755C:: @ 849755C
 	.4byte fish0
 	.4byte fish1
@@ -139,19 +140,21 @@ gUnknown_0849755C:: @ 849755C
 	.4byte fishF
 
 gUnknown_0849759C:: @ 849759C
-	.incbin "baserom.gba", 0x49759c, 0x6
+	.2byte 1, 1, 1
 
 gUnknown_084975A2:: @ 84975A2
-	.incbin "baserom.gba", 0x4975a2, 0x6
+	.2byte 1, 3, 6
 
 gUnknown_084975A8:: @ 84975A8
-	.incbin "baserom.gba", 0x4975a8, 0x2
+	.string "·$"
 
 gUnknown_084975AA:: @ 84975AA
-	.incbin "baserom.gba", 0x4975aa, 0x6
+	.2byte 36, 33, 30
 
 gUnknown_084975B0:: @ 84975B0
-	.incbin "baserom.gba", 0x4975b0, 0xc
+	.2byte 0, 0
+	.2byte 0x28, 10
+	.2byte 0x46, 30
 
 gUnknown_084975BC:: @ 84975BC
 	.byte 0x01, 0x03, 0x04, 0x02, 0x01, 0x00, 0x00, 0x00

data/field_special_scene.s

@@ -6,10 +6,10 @@
 	.align 2, 0
 
 gTruckCamera_HorizontalTable:: @ 858E898
-	.incbin "baserom.gba", 0x58e898, 0x13
+	.byte 0, 0, 0, 0, 0, 0, 0, 0, 1, 2, 2, 2, 2, 2, 2, -1, -1, -1, 0
 
 gUnknown_0858E8AB:: @ 858E8AB
-	.incbin "baserom.gba", 0x58e8ab, 0x2
+	.byte 0x18, 0xFE
 
 gUnknown_0858E8AD:: @ 858E8AD
-	.incbin "baserom.gba", 0x58e8ad, 0x3
+	.byte 0x17, 0xFE

data/field_tasks.s

@@ -5,19 +5,95 @@
     .align 2, 0
 
 gUnknown_08510348:: @ 8510348
-	.incbin "baserom.gba", 0x510348, 0x20
+	.4byte nullsub_34
+	.4byte sub_809E3B4
+	.4byte sub_809DEF0
+	.4byte sub_809DCB4
+	.4byte sub_809E224
+	.4byte EndTruckSequence
+	.4byte sub_80EA3E4
+	.4byte sub_809E4CC
 
 gUnknown_08510368:: @ 8510368
-	.incbin "baserom.gba", 0x510368, 0x20
+	.byte 0
+	.byte 0
+	.2byte 0x259
+	.byte 0
+	.byte 1
+	.2byte 0x261
+	.byte 0
+	.byte 0xFF
+	.2byte 0x259
+	.byte 0
+	.byte 0
+	.2byte 0x261
+	.byte 0
+	.byte 0
+	.2byte 0x252
+	.byte 1
+	.byte 0
+	.2byte 0x253
+	.byte 0xFF
+	.byte 0
+	.2byte 0x252
+	.byte 0
+	.byte 0
+	.2byte 0x253
 
 gUnknown_08510388:: @ 8510388
-	.incbin "baserom.gba", 0x510388, 0x20
+	.byte 0
+	.byte 0
+	.2byte 0x25A
+	.byte 0
+	.byte 1
+	.2byte 0x262
+	.byte 0
+	.byte 0xFF
+	.2byte 0x25A
+	.byte 0
+	.byte 0
+	.2byte 0x262
+	.byte 0
+	.byte 0
+	.2byte 0x254
+	.byte 1
+	.byte 0
+	.2byte 0x255
+	.byte 0xFF
+	.byte 0
+	.2byte 0x254
+	.byte 0
+	.byte 0
+	.2byte 0x255
 
 gUnknown_085103A8:: @ 85103A8
-	.incbin "baserom.gba", 0x5103a8, 0x20
+	.byte 0
+	.byte 0
+	.2byte 0x258
+	.byte 0
+	.byte 1
+	.2byte 0x260
+	.byte 0
+	.byte 0xFF
+	.2byte 0x258
+	.byte 0
+	.byte 0
+	.2byte 0x260
+	.byte 0
+	.byte 0
+	.2byte 0x250
+	.byte 1
+	.byte 0
+	.2byte 0x251
+	.byte 0xFF
+	.byte 0
+	.2byte 0x250
+	.byte 0
+	.byte 0
+	.2byte 0x251
 
 gUnknown_085103C8:: @ 85103C8
-	.incbin "baserom.gba", 0x5103c8, 0x34
+	.2byte 0, 0, 0, 0, 0, 0, 0x4001, 0x4002, 0x4003, 0x4004, 0, 0, 0x4005, 0x4006, 0x4007, 0, 0, 0x4008, 0x4009, 0x400a, 0, 0, 0, 0, 0, 0
 
 gUnknown_085103FC:: @ 85103FC
-	.incbin "baserom.gba", 0x5103fc, 0x8
+	.2byte 0xE8, 0xeb, 0xea, 0xe9

data/fldeff_cut.s

@@ -5,16 +5,28 @@
     .align 2, 0
 
 gUnknown_0857C608:: @ 857C608
-	.incbin "baserom.gba", 0x57c608, 0x2
+	.byte 0xfe, 0xfe, 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, 
+	
+gUnknown_0857C648:: @ 857C648
+	.2byte 0
+	.2byte 0
+	.2byte 0x1401
+	.2byte 0
 
-gUnknown_0857C60A:: @ 857C60A
+gUnknown_0857C650:: @ 857C650	
-	.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
+	obj_image_anim_frame 0, 0x1E
-	.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
+	obj_image_anim_jump 0
-	.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
+	
+gUnknown_0857C658:: @ 857C658	
+	.4byte gUnknown_0857C650
+	
+gUnknown_0857C65C:: @ 857C65C
+	obj_frame_tiles gFieldEffectObjectPic_ShadowExtraLarge + 0x520, 32
 
 	.align 2
 gFieldEffectObjectPaletteInfo6:: @ 857C664
 	obj_pal gFieldEffectObjectPalette6, 0x1000
 
 gUnknown_0857C66C:: @ 857C66C
-	.incbin "baserom.gba", 0x57c66c, 0x18
+	spr_template -1, 0x1000, gUnknown_0857C648, gUnknown_0857C658, gUnknown_0857C65C, gDummySpriteAffineAnimTable, objc_8097BA8

data/fossil_special_fldeff_groundshake.s

@@ -3,32 +3,96 @@
 
 	.section .rodata
 
+	.align 2
 gUnknown_08617274:: @ 8617274
-	.incbin "baserom.gba", 0x617274, 0x920
+	.space 0x20
+	.incbin "graphics/misc/mirage_tower.4bpp"
 
+	.align 2
 gUnknown_08617B94:: @ 8617B94
-	.incbin "baserom.gba", 0x617b94, 0xb0
+	.incbin "graphics/misc/mirage_tower.bin"
 
-gUnknown_08617C44:: @ 8617C44
+	.align 2
-	.incbin "baserom.gba", 0x617c44, 0x120
+gRootFossil_Pal:: @ 8617C24
+	.incbin "graphics/misc/fossil.gbapal"
 
+	.align 2
+gRootFossil_Gfx:: @ 8617C44
+	.incbin "graphics/misc/fossil.4bpp"
+
+	.align 2
+gMirageTowerCrumbles_Gfx:: @ 8617CC4
+	.incbin "graphics/misc/mirage_tower_crumbles.4bpp"
+
+	.align 2
+gMirageTowerCrumbles_Palette:: @ 8617D44
+	.incbin "graphics/misc/mirage_tower_crumbles.gbapal"
+
+	.align 1
 gUnknown_08617D64:: @ 8617D64
-	.incbin "baserom.gba", 0x617d64, 0x30
+	.2byte 0x0000, 0x000a, 0x0041, 0x0011, 0x0003, 0x0032, 0xfff4, 0x0000, 0x004b, 0x000a, 0x000f, 0x005a, 0x0007, 0x0008, 0x0041, 0xffee
+	.2byte 0x0005, 0x004b, 0x0016, 0xfff6, 0x0037, 0xffe8, 0xfffc, 0x0041
 
+	.align 2
 gUnknown_08617D94:: @ 8617D94
-	.incbin "baserom.gba", 0x617d94, 0x10
+	obj_tiles gMirageTowerCrumbles_Gfx, 0x0080, 0x0fa0
+	null_obj_tiles
 
+	.align 2
 gUnknown_08617DA4:: @ 8617DA4
-	.incbin "baserom.gba", 0x617da4, 0x5c
+	.byte 0x12, 0x35, 0x51, 0x02, 0x13, 0x35, 0x51, 0x02, 0x14, 0x35, 0x51, 0x02, 0x12, 0x36, 0x51, 0x02, 0x13, 0x36, 0x51, 0x02, 0x14, 0x36, 0x51, 0x02, 0x12, 0x37, 0x51, 0x02, 0x13, 0x37, 0x51, 0x02
+	.byte 0x14, 0x37, 0x51, 0x02, 0x12, 0x38, 0x51, 0x02, 0x13, 0x38, 0x51, 0x02, 0x14, 0x38, 0x51, 0x02, 0x12, 0x39, 0x59, 0x02, 0x13, 0x39, 0x59, 0x02, 0x14, 0x39, 0x59, 0x02, 0x12, 0x3a, 0x21, 0x01
+	.byte 0x13, 0x3a, 0x21, 0x01, 0x14, 0x3a, 0x21, 0x01
 
+	.align 2
+gSpriteAnim_8617DEC:: @ 8617DEC
+	.2byte 0x0000, 0x0001, 0xffff, 0x0000
+
+	.align 2
+gOamData_8617DF4:: @ 8617DF4
+	.2byte 0x0000, 0x4000, 0x3000, 0x0000
+
+	.align 2
+gSpriteAnimTable_8617DFC:: @ 8617DFC
+	.4byte gSpriteAnim_8617DEC
+
+	.align 2
 gUnknown_08617E00:: @ 8617E00
-	.incbin "baserom.gba", 0x617e00, 0x18
+	spr_template 0xffff, 0xffff, gOamData_8617DF4, gSpriteAnimTable_8617DFC, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
+	.align 2
 gUnknown_08617E18:: @ 8617E18
-	.incbin "baserom.gba", 0x617e18, 0x1c
+	.byte 0x3b, 0x43, 0x61, 0x00, 0x0f, 0x05, 0xff, 0x9b
 
+	.align 2
+gSpriteAnim_8617E20:: @ 8617E20
+	.2byte 0x0000, 0x000c, 0xfffe, 0x0000
+
+	.align 2
+gSpriteAnimTable_8617E28:: @ 8617E28
+	.4byte gSpriteAnim_8617E20
+
+	.align 2
+gUnknown_08617E2C:: @ 8617E2C
+	.2byte 0x0000, 0x0000, 0x0000, 0x0000
+
+	.align 2
 gUnknown_08617E34:: @ 8617E34
-	.incbin "baserom.gba", 0x617e34, 0x2c
+	spr_template 0x0fa0, 0xffff, gUnknown_08617E2C, gSpriteAnimTable_8617E28, NULL, gDummySpriteAffineAnimTable, sub_81BEAD8
 
+	.align 2
+gSpriteAnim_8617E4C:: @ 8617E4C
+	.2byte 0x0000, 0x000c, 0xfffe, 0x0000
+
+	.align 2
+gSpriteAnim_8617E54:: @ 8617E54
+	.4byte gSpriteAnim_8617E4C
+
+	.align 2
+gOamData_8617E58:: @ 8617E58
+	.2byte 0x0000, 0x4000, 0x0000, 0x0000
+
+	.align 2
 gUnknown_08617E60:: @ 8617E60
-	.incbin "baserom.gba", 0x617e60, 0x18
+	spr_template 0x0fa0, 0xffff, gOamData_8617E58, gSpriteAnim_8617E54, NULL, gDummySpriteAffineAnimTable, sub_81BEAD8
+

data/graphics.s

@@ -5041,7 +5041,7 @@ gUnknown_08DDD704:: @ 8DDD704
 	.incbin "graphics/unknown/unknown_DDD704.bin" @ textbox tilemap??
 
 	.align 2
-gUnknown_08DDD728:: @ 8DDD728
+gMessageBox_Pal:: @ 8DDD728
 	.incbin "graphics/text_window/message_box.gbapal"
 
 	.align 2

data/graphics/field_objects/field_object_graphics.inc

@@ -5386,7 +5386,8 @@ gFieldEffectObjectPic_ShadowLarge:: @ 84F68B8
 gFieldEffectObjectPic_ShadowExtraLarge:: @ 84F6938
 	.incbin "graphics/map_objects/pics/effects/shadow_extra_large.4bpp"
 
-	.incbin "baserom.gba", 0x4f6d38, 0x160
+gUnknown_084F6D38:: @ 84F6D38
+	.incbin "graphics/map_objects/pics/effects/unknown_4F6D38/0.4bpp"
 
 	.align 2
 gFieldEffectObjectPalette6:: @ 84F6E98
@@ -5500,7 +5501,17 @@ gFieldEffectObjectPic_BikeHopTallGrass_2:: @ 84F7938
 gFieldEffectObjectPic_BikeHopTallGrass_3:: @ 84F7978
 	.incbin "graphics/map_objects/pics/effects/bike_hop_tall_grass/3.4bpp"
 
-	.incbin "baserom.gba", 0x4f79b8, 0x200
+gUnusedGrass_0:: @4F79B8
+	.incbin "graphics/map_objects/pics/effects/unused_grass/0.4bpp"
+	
+gUnusedGrass_1:: @4F7A38
+	.incbin "graphics/map_objects/pics/effects/unused_grass/1.4bpp"
+	
+gUnusedGrass_2:: @4F7AB8
+	.incbin "graphics/map_objects/pics/effects/unused_grass/2.4bpp"
+	
+gUnusedGrass_3:: @4F7B38
+	.incbin "graphics/map_objects/pics/effects/unused_grass/3.4bpp"
 
 	.align 2
 gFieldEffectObjectPic_Unknown16_0:: @ 84F7BB8
@@ -5522,7 +5533,8 @@ gFieldEffectObjectPic_Unknown16_3:: @ 84F7D38
 gFieldEffectObjectPic_Unknown16_4:: @ 84F7DB8
 	.incbin "graphics/map_objects/pics/effects/unknown_16/4.4bpp"
 
-	.incbin "baserom.gba", 0x4f7e38, 0x80
+gUnknown_084F7E38:: @ 84F7E38
+	.incbin "graphics/map_objects/pics/effects/unknown_4F7E38/0.4bpp"
 
 	.align 2
 gFieldEffectObjectPic_Unknown16_5:: @ 84F7EB8

data/item_icon.s

@@ -6,8 +6,18 @@
 @ 8614410
 	.include "data/graphics/items/item_icon_table.inc"
 
-@ 8614FE0
+gUnknown_08614FE0:: @ 8614FE0
-	.incbin "baserom.gba", 0x614fe0, 0x14
+	.2byte 0
+	.2byte 0x8000
+	.2byte 0x2400
+	.2byte 0
+	
+gUnknown_08614FE8:: @ 8614FE8
+	obj_image_anim_frame 0, 0
+	obj_image_anim_end
+	
+gUnknown_08614FF0:: @ 8614FF0
+	.4byte gUnknown_08614FE8
 
 gUnknown_08614FF4:: @ 8614FF4
-	.incbin "baserom.gba", 0x614ff4, 0x18
+	spr_template 0, 0, gUnknown_08614FE0, gUnknown_08614FF0, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy

data/item_menu.s

@@ -100,13 +100,28 @@ gUnknown_08614094:: @ 8614094
 	.4byte 0x6F
 
 gUnknown_086140A4:: @ 86140A4
-	.incbin "baserom.gba", 0x6140a4, 0xc0
+	.incbin "graphics/interface/select_button.4bpp"
 
 gUnknown_08614164:: @ 8614164
-	.incbin "baserom.gba", 0x614164, 0x10
+	.byte 0, 1, 3, 0, 1, 4, 0, 3, 6, 2, 1, 3, 0, 14, 10, 0
 
 gUnknown_08614174:: @ 8614174
-	.incbin "baserom.gba", 0x614174, 0x38
+	window_template 0, 14, 2, 15, 16, 1, 0x27
+	window_template 0, 0, 13, 14, 6, 1, 0x117
+	window_template 0, 4, 1, 8, 2, 1, 0x1A1
+	window_template 0, 1, 13, 5, 6, 12, 0x16B
+	window_template 0, 7, 13, 4, 6, 12, 0x189
+	window_template 1, 2, 15, 27, 4, 15, 0x1B1
+	null_window_template
 
 gUnknown_086141AC:: @ 86141AC
-	.incbin "baserom.gba", 0x6141ac, 0x50
+	window_template 1, 22, 17, 7, 2, 15, 0x21D
+	window_template 1, 22, 15, 7, 4, 15, 0x21D
+	window_template 1, 15, 15, 14, 4, 15, 0x21D
+	window_template 1, 15, 13, 14, 6, 15, 0x21D
+	window_template 1, 2, 15, 27, 4, 15, 0x1B1
+	window_template 1, 24, 15, 5, 4, 15, 0x21D
+	window_template 1, 21, 9, 5, 4, 15, 0x21D
+	window_template 1, 24, 17, 5, 2, 15, 0x21D
+	window_template 1, 18, 11, 10, 2, 15, 0x245
+	window_template 1, 1, 1, 10, 2, 15, 0x231

data/librfu_rodata.s

@@ -1,7 +1,10 @@
 	.section .rodata
 
 gUnknown_089A3220:: @ 89A3220
-	.incbin "baserom.gba", 0x9a3220, 0x20
+	.byte 2, 14, 0, 10, 9, 5, 7, 2
+	.byte 0, 15, 1, 3, 3, 0, 31, 0
+	.byte 3, 22, 18, 14, 13, 9, 11, 3
+	.byte 15, 15, 1, 3, 3, 0, 0x7f, 0
 
 	.asciz "RFU_V1026"
 

data/map_name_popup.s

@@ -4,20 +4,66 @@
     .section .rodata
     .align 2, 0
 
-gUnknown_0857C684:: @ 857C684
+gMapPopUp_Table:: @ 857C684
-	.incbin "baserom.gba", 0x57c684, 0x1680
+	.incbin "graphics/interface/map_popup/wood.4bpp"
+	.incbin "graphics/interface/map_popup/marble.4bpp"
+	.incbin "graphics/interface/map_popup/stone.4bpp"
+	.incbin "graphics/interface/map_popup/brick.4bpp"
+	.incbin "graphics/interface/map_popup/underwater.4bpp"
+	.incbin "graphics/interface/map_popup/stone2.4bpp"
 
-gUnknown_0857DD04:: @ 857DD04
+gMapPopUp_Outline_Table:: @ 857DD04
-	.incbin "baserom.gba", 0x57dd04, 0x1680
+	.incbin "graphics/interface/map_popup/wood_outline.4bpp"
+	.incbin "graphics/interface/map_popup/marble_outline.4bpp"
+	.incbin "graphics/interface/map_popup/stone_outline.4bpp"
+	.incbin "graphics/interface/map_popup/brick_outline.4bpp"
+	.incbin "graphics/interface/map_popup/underwater_outline.4bpp"
+	.incbin "graphics/interface/map_popup/stone2_outline.4bpp"
 
-gUnknown_0857F384:: @ 857F384
+gMapPopUp_Palette_Table:: @ 857F384
-	.incbin "baserom.gba", 0x57f384, 0xc0
+	.incbin "graphics/interface/map_popup/wood.gbapal"
+	.incbin "graphics/interface/map_popup/marble.gbapal"
+	.incbin "graphics/interface/map_popup/stone.gbapal"
+	.incbin "graphics/interface/map_popup/brick.gbapal"
+	.incbin "graphics/interface/map_popup/underwater.gbapal"
+	.incbin "graphics/interface/map_popup/stone2.gbapal"
 
 gUnknown_0857F444:: @ 857F444
-	.incbin "baserom.gba", 0x57f444, 0x20
+	.incbin "graphics/interface/map_popup/857F444.gbapal"
 
 gUnknown_0857F464:: @ 857F464
-	.incbin "baserom.gba", 0x57f464, 0xe0
+	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x01, 0x01, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x00, 0x00, 0x00, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x05, 0x05, 0x05, 0x05, 0x02, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x05, 0x02, 0x00, 0x02, 0x00, 0x02, 0x02, 0x00, 0x00, 0x02, 0x05, 0x02, 0x02, 0x02, 0x02, 0x00, 0x02, 0x02, 0x01, 0x02, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x05, 0x02, 0x05, 0x05, 0x05, 0x02, 0x02, 0x02, 0x01
+	
+gUnknown_0857F4CC:: @ 857F4CC
+	.string "PYRAMID FLOOR 1$"
+	
+gUnknown_0857F4DC:: @ 857F4DC
+	.string "PYRAMID FLOOR 2$"
+	
+gUnknown_0857F4EC:: @ 857F4EC
+	.string "PYRAMID FLOOR 3$"
+	
+gUnknown_0857F4FC:: @ 857F4FC
+	.string "PYRAMID FLOOR 4$"
+	
+gUnknown_0857F50C:: @ 857F50C
+	.string "PYRAMID FLOOR 5$"
+	
+gUnknown_0857F51C:: @ 857F51C
+	.string "PYRAMID FLOOR 6$"
+	
+gUnknown_0857F52C:: @ 857F52C
+	.string "PYRAMID FLOOR 7$"
+	
+gUnknown_0857F53C:: @ 857F53C
+	.string "PYRAMID$"
 
 gUnknown_0857F544:: @ 857F544
-	.incbin "baserom.gba", 0x57f544, 0x20
+	.4byte gUnknown_0857F4CC
+	.4byte gUnknown_0857F4DC
+	.4byte gUnknown_0857F4EC
+	.4byte gUnknown_0857F4FC
+	.4byte gUnknown_0857F50C
+	.4byte gUnknown_0857F51C
+	.4byte gUnknown_0857F52C
+	.4byte gUnknown_0857F53C

data/mauville_old_man.s

@@ -28,13 +28,31 @@ gUnknown_0859F010:: @ 859F010
 	.4byte gUnknown_082944D5
 
 gUnknown_0859F030:: @ 859F030
-	.incbin "baserom.gba", 0x59f030, 0x18
+	.4byte 0, 12, 13, 18, 19, 21
 
 gUnknown_0859F048:: @ 859F048
-	.incbin "baserom.gba", 0x59f048, 0x230
+	.4byte 0x00000132, MauvilleCity_PokemonCenter_1F_Text_28E930, MauvilleCity_PokemonCenter_1F_Text_28E947, MauvilleCity_PokemonCenter_1F_Text_28E956, 0x00000102, MauvilleCity_PokemonCenter_1F_Text_28E9D7, MauvilleCity_PokemonCenter_1F_Text_28E9EF, MauvilleCity_PokemonCenter_1F_Text_28E9FE
+	.4byte 0x00000103, MauvilleCity_PokemonCenter_1F_Text_28EA7D, MauvilleCity_PokemonCenter_1F_Text_28EA98, MauvilleCity_PokemonCenter_1F_Text_28EAA8, 0x00000104, MauvilleCity_PokemonCenter_1F_Text_28EB19, MauvilleCity_PokemonCenter_1F_Text_28EB31, MauvilleCity_PokemonCenter_1F_Text_28EB3E
+	.4byte 0x00000106, MauvilleCity_PokemonCenter_1F_Text_28EBB5, MauvilleCity_PokemonCenter_1F_Text_28EBCD, MauvilleCity_PokemonCenter_1F_Text_28EBDD, 0x00000109, MauvilleCity_PokemonCenter_1F_Text_28EC60, MauvilleCity_PokemonCenter_1F_Text_28EC79, MauvilleCity_PokemonCenter_1F_Text_28EC81
+	.4byte 0x0000010b, MauvilleCity_PokemonCenter_1F_Text_28ED04, MauvilleCity_PokemonCenter_1F_Text_28ED21, MauvilleCity_PokemonCenter_1F_Text_28ED30, 0x0000010c, MauvilleCity_PokemonCenter_1F_Text_28EDA1, MauvilleCity_PokemonCenter_1F_Text_28EDB5, MauvilleCity_PokemonCenter_1F_Text_28EDCF
+	.4byte 0x0000010d, MauvilleCity_PokemonCenter_1F_Text_28EE45, MauvilleCity_PokemonCenter_1F_Text_28EE5D, MauvilleCity_PokemonCenter_1F_Text_28EE6A, 0x0000010e, MauvilleCity_PokemonCenter_1F_Text_28EEDD, MauvilleCity_PokemonCenter_1F_Text_28EEF1, MauvilleCity_PokemonCenter_1F_Text_28EF01
+	.4byte 0x0000010f, MauvilleCity_PokemonCenter_1F_Text_28EF73, MauvilleCity_PokemonCenter_1F_Text_28EF95, MauvilleCity_PokemonCenter_1F_Text_28EFAA, 0x00000110, MauvilleCity_PokemonCenter_1F_Text_28F045, MauvilleCity_PokemonCenter_1F_Text_28F05A, MauvilleCity_PokemonCenter_1F_Text_28F071
+	.4byte 0x00000111, MauvilleCity_PokemonCenter_1F_Text_28F0F3, MauvilleCity_PokemonCenter_1F_Text_28F10D, MauvilleCity_PokemonCenter_1F_Text_28F125, 0x00000112, MauvilleCity_PokemonCenter_1F_Text_28F1BE, MauvilleCity_PokemonCenter_1F_Text_28F1D5, MauvilleCity_PokemonCenter_1F_Text_28F1DE
+	.4byte 0x00000113, MauvilleCity_PokemonCenter_1F_Text_28F24F, MauvilleCity_PokemonCenter_1F_Text_28F269, MauvilleCity_PokemonCenter_1F_Text_28F277, 0x00000114, MauvilleCity_PokemonCenter_1F_Text_28F2FC, MauvilleCity_PokemonCenter_1F_Text_28F314, MauvilleCity_PokemonCenter_1F_Text_28F32A
+	.4byte 0x0000011a, MauvilleCity_PokemonCenter_1F_Text_28F3AD, MauvilleCity_PokemonCenter_1F_Text_28F3C6, MauvilleCity_PokemonCenter_1F_Text_28F3D2, 0x0000011b, MauvilleCity_PokemonCenter_1F_Text_28F44B, MauvilleCity_PokemonCenter_1F_Text_28F461, MauvilleCity_PokemonCenter_1F_Text_28F47C
+	.4byte 0x0000011c, MauvilleCity_PokemonCenter_1F_Text_28F50C, MauvilleCity_PokemonCenter_1F_Text_28F51B, MauvilleCity_PokemonCenter_1F_Text_28F538, 0x0000021d, MauvilleCity_PokemonCenter_1F_Text_28F5BE, MauvilleCity_PokemonCenter_1F_Text_28F5D1, MauvilleCity_PokemonCenter_1F_Text_28F5F2
+	.4byte 0x0000011e, MauvilleCity_PokemonCenter_1F_Text_28F678, MauvilleCity_PokemonCenter_1F_Text_28F694, MauvilleCity_PokemonCenter_1F_Text_28F6B4, 0x00000121, MauvilleCity_PokemonCenter_1F_Text_28F751, MauvilleCity_PokemonCenter_1F_Text_28F76A, MauvilleCity_PokemonCenter_1F_Text_28F776
+	.4byte 0x00000124, MauvilleCity_PokemonCenter_1F_Text_28F7F6, MauvilleCity_PokemonCenter_1F_Text_28F811, MauvilleCity_PokemonCenter_1F_Text_28F822, 0x00000125, MauvilleCity_PokemonCenter_1F_Text_28F89C, MauvilleCity_PokemonCenter_1F_Text_28F8AF, MauvilleCity_PokemonCenter_1F_Text_28F8BC
+	.4byte 0x00000126, MauvilleCity_PokemonCenter_1F_Text_28F92F, MauvilleCity_PokemonCenter_1F_Text_28F941, MauvilleCity_PokemonCenter_1F_Text_28F949, 0x00000127, MauvilleCity_PokemonCenter_1F_Text_28F9D1, MauvilleCity_PokemonCenter_1F_Text_28F9EA, MauvilleCity_PokemonCenter_1F_Text_28F9FD
+	.4byte 0x00000128, MauvilleCity_PokemonCenter_1F_Text_28FA81, MauvilleCity_PokemonCenter_1F_Text_28FA99, MauvilleCity_PokemonCenter_1F_Text_28FAA7, 0x00000129, MauvilleCity_PokemonCenter_1F_Text_28FB1D, MauvilleCity_PokemonCenter_1F_Text_28FB35, MauvilleCity_PokemonCenter_1F_Text_28FB47
+	.4byte 0x0000012a, MauvilleCity_PokemonCenter_1F_Text_28FBC4, MauvilleCity_PokemonCenter_1F_Text_28FBD9, MauvilleCity_PokemonCenter_1F_Text_28FBEA, 0x0000012b, MauvilleCity_PokemonCenter_1F_Text_28FC6B, MauvilleCity_PokemonCenter_1F_Text_28FC85, MauvilleCity_PokemonCenter_1F_Text_28FC98
+	.4byte 0x0000012c, MauvilleCity_PokemonCenter_1F_Text_28FD1D, MauvilleCity_PokemonCenter_1F_Text_28FD35, MauvilleCity_PokemonCenter_1F_Text_28FD40, 0x0000012d, MauvilleCity_PokemonCenter_1F_Text_28FDA2, MauvilleCity_PokemonCenter_1F_Text_28FDBD, MauvilleCity_PokemonCenter_1F_Text_28FDCE
+	.4byte 0x0000012e, MauvilleCity_PokemonCenter_1F_Text_28FE57, MauvilleCity_PokemonCenter_1F_Text_28FE72, MauvilleCity_PokemonCenter_1F_Text_28FE88, 0x0000012f, MauvilleCity_PokemonCenter_1F_Text_28FF0C, MauvilleCity_PokemonCenter_1F_Text_28FF27, MauvilleCity_PokemonCenter_1F_Text_28FF44
+	.4byte 0x00000130, MauvilleCity_PokemonCenter_1F_Text_28FFDD, MauvilleCity_PokemonCenter_1F_Text_28FFFA, MauvilleCity_PokemonCenter_1F_Text_29000D
+
 
 gUnknown_0859F278:: @ 859F278
-	.incbin "baserom.gba", 0x59f278, 0x10
+	.4byte 0x00000131, MauvilleCity_PokemonCenter_1F_Text_290097, MauvilleCity_PokemonCenter_1F_Text_2900B5, MauvilleCity_PokemonCenter_1F_Text_2900CB
 
 gUnknown_0859F288:: @ 859F288
 	.4byte 0x00000024, 0x00000008

data/menu_helpers.s

@@ -4,11 +4,34 @@
 	.section .rodata
 	.align 2, 0
 
+gUnknown_0859F4E8:: @ 859F4E8
+    .2byte 0x00
+	.2byte 0x4000 
+	.2byte 0x00
+	.2byte 0x00
+
+gUnknown_0859F4F0:: @ 859F4F0
+    obj_image_anim_frame 0x00, 0x00
+	obj_image_anim_end
+
+gUnknown_0859F4F8:: @ 859F4F8
+    obj_image_anim_frame 0x04, 0x00
+	obj_image_anim_end
+
+gUnknown_0859F500:: @ 859F500
+    obj_image_anim_frame 0x00, 0x40
+	obj_image_anim_end
+
+gUnknown_0859F508:: @ 859F508
+    .4byte gUnknown_0859F4F0
+    .4byte gUnknown_0859F4F8
+    .4byte gUnknown_0859F500
+	
 gUnknown_0859F514:: @ 859F514
-	.incbin "baserom.gba", 0x59f514, 0x8
+	.4byte gBagSwapLineGfx, 0x6D0100
 
 gUnknown_0859F51C:: @ 859F51C
-	.incbin "baserom.gba", 0x59f51c, 0x8
+	.4byte gBagSwapLinePal, 0x6D
 
 gUnknown_0859F524:: @ 859F524
-	.incbin "baserom.gba", 0x59f524, 0x18
+	spr_template 0x6D, 0x6D, gUnknown_0859F4E8, gUnknown_0859F508, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy

data/menu_indicators.s

@@ -4,10 +4,41 @@
 	.section .rodata
 
 gUnknown_086141FC:: @ 86141FC
-	.incbin "baserom.gba", 0x6141fc, 0x48
+	.byte 0, 2, 8, 0
+	.byte 1, 2, -8, -1
+	.byte 18, 2, 8, 0
+	.byte 19, 2, -8, -1
+	
+gUnknown_0861420C:: @ 861420C
+	.2byte 0
+	.2byte 0x4000
+	.2byte 0
+	.2byte 0
+	
+gUnknown_08614214:: @ 8614214
+	obj_image_anim_frame 0, 30
+	obj_image_anim_end
+	
+gUnknown_0861421C:: @ 861421C
+	obj_image_anim_frame 0, 0x5e
+	obj_image_anim_end
+	
+gUnknown_08614224:: @ 8614224
+	obj_image_anim_frame 4, 30
+	obj_image_anim_end
+	
+gUnknown_0861422C:: @ 861422C
+	obj_image_anim_frame 4, 0x9e
+	obj_image_anim_end
+	
+gUnknown_08614234:: @ 8614234
+	.4byte gUnknown_08614214
+	.4byte gUnknown_0861421C
+	.4byte gUnknown_08614224
+	.4byte gUnknown_0861422C
 
 gUnknown_08614244:: @ 8614244
-	.incbin "baserom.gba", 0x614244, 0x18
+	spr_template 0, 0, gUnknown_0861420C, gUnknown_08614234, NULL, gDummySpriteAffineAnimTable, sub_81AF264
 
 gUnknown_0861425C:: @ 861425C
 	.4byte 0x00000000
@@ -34,19 +65,29 @@ gUnknown_08614278:: @ 8614278
 	.4byte 0x00700000
 
 gUnknown_0861427C:: @ 861427C
-	.incbin "baserom.gba", 0x61427C, 0x14
+	.2byte 0
+	.2byte 0x4000
+	.2byte 0
+	.2byte 0
+
+gUnknown_08614284:: @ 8614284
+	obj_image_anim_frame 0, 30
+	obj_image_anim_end
+	
+gUnknown_0861428C:: @ 861428C
+	.4byte gUnknown_08614284
 
 gUnknown_08614290:: @ 8614290
-	.incbin "baserom.gba", 0x614290, 0x18
+	spr_template 0, 0, gUnknown_0861427C, gUnknown_0861428C, NULL, gDummySpriteAffineAnimTable, ObjectCB_RedArrowCursor
 
 gUnknown_086142A8:: @ 86142A8
-	.incbin "baserom.gba", 0x6142a8, 0x20
+	.incbin "graphics/interface/red_arrow.gbapal"
 
 gUnknown_086142C8:: @ 86142C8
-	.incbin "baserom.gba", 0x6142c8, 0x70
+	.incbin "graphics/interface/red_arrow_other.4bpp.lz"
 
 gUnknown_08614338:: @ 8614338
-	.incbin "baserom.gba", 0x614338, 0x40
+	.incbin "graphics/interface/selector_outline.4bpp.lz"
 
 gUnknown_08614378:: @ 8614378
-	.incbin "baserom.gba", 0x614378, 0x44
+	.incbin "graphics/interface/red_arrow.4bpp.lz"

data/mon_markings.s

@@ -5,25 +5,153 @@
 	.align 2, 0
 
 gUnknown_0859E65C:: @ 859E65C
-	.incbin "baserom.gba", 0x59e65c, 0x20
+	.incbin "graphics/misc/mon_markings.gbapal"
 
 gUnknown_0859E67C:: @ 859E67C
-	.incbin "baserom.gba", 0x59e67c, 0x800
+	.incbin "graphics/misc/mon_markings.4bpp"
 
 gUnknown_0859EE7C:: @ 859EE7C
-	.incbin "baserom.gba", 0x59ee7c, 0x8
+	.2byte 0, 0xC000, 0, 0
 
 gUnknown_0859EE84:: @ 859EE84
-	.incbin "baserom.gba", 0x59ee84, 0x58
+	.2byte 0, 0, 0, 0
+	
+gUnknown_0859EE8C:: @ 859EE8C
+	.2byte 0, 5, -1, 0
+	
+gUnknown_0859EE94:: @ 859EE94
+	.2byte 1, 5, -1, 0
+	
+gUnknown_0859EE9C:: @ 859EE9C
+	.2byte 2, 5, -1, 0
+	
+gUnknown_0859EEA4:: @ 859EEA4
+	.2byte 3, 5, -1, 0
+	
+gUnknown_0859EEAC:: @ 859EEAC
+	.2byte 4, 5, -1, 0
+	
+gUnknown_0859EEB4:: @ 859EEB4
+	.2byte 5, 5, -1, 0
+	
+gUnknown_0859EEBC:: @ 859EEBC
+	.2byte 6, 5, -1, 0
+	
+gUnknown_0859EEC4:: @ 859EEC4
+	.2byte 7, 5, -1, 0
+	
+gUnknown_0859EECC:: @ 859EECC
+	.2byte 8, 5, -1, 0
+	
+gUnknown_0859EED4:: @ 859EED4
+	.2byte 9, 5, -1, 0
 
 gUnknown_0859EEDC:: @ 859EEDC
-	.incbin "baserom.gba", 0x59eedc, 0x38
+	.4byte gUnknown_0859EE8C
+	.4byte gUnknown_0859EE94
+	.4byte gUnknown_0859EE9C
+	.4byte gUnknown_0859EEA4
+	.4byte gUnknown_0859EEAC
+	.4byte gUnknown_0859EEB4
+	.4byte gUnknown_0859EEBC
+	.4byte gUnknown_0859EEC4
+	.4byte gUnknown_0859EECC
+	.4byte gUnknown_0859EED4
 
+gUnknown_0859EF04:: @ 859EF04
+	.2byte 0, 5, -1, 0
+	
+gUnknown_0859EF0C:: @ 859EF0C
+	.2byte 64, 5, -1, 0
+	
 gUnknown_0859EF14:: @ 859EF14
-	.incbin "baserom.gba", 0x59ef14, 0x8
+	.4byte gUnknown_0859EF04
+	.4byte gUnknown_0859EF0C
 
 gUnknown_0859EF1C:: @ 859EF1C
-	.incbin "baserom.gba", 0x59ef1c, 0x88
+	.2byte 0x4000
+	.2byte 0x4000
+	.2byte 0
+	.2byte 0
+
+gUnknown_0859EF24:: @ 859EF24
+	obj_image_anim_frame 0, 5
+	obj_image_anim_end
+
+gUnknown_0859EF2C:: @ 859EF2C
+	obj_image_anim_frame 4, 5
+	obj_image_anim_end
+
+gUnknown_0859EF34:: @ 859EF34
+	obj_image_anim_frame 8, 5
+	obj_image_anim_end
+
+gUnknown_0859EF3C:: @ 859EF3C
+	obj_image_anim_frame 12, 5
+	obj_image_anim_end
+
+gUnknown_0859EF44:: @ 859EF44
+	obj_image_anim_frame 16, 5
+	obj_image_anim_end
+
+gUnknown_0859EF4C:: @ 859EF4C
+	obj_image_anim_frame 20, 5
+	obj_image_anim_end
+
+gUnknown_0859EF54:: @ 859EF54
+	obj_image_anim_frame 24, 5
+	obj_image_anim_end
+
+gUnknown_0859EF5C:: @ 859EF5C
+	obj_image_anim_frame 28, 5
+	obj_image_anim_end
+
+gUnknown_0859EF64:: @ 859EF64
+	obj_image_anim_frame 32, 5
+	obj_image_anim_end
+
+gUnknown_0859EF6C:: @ 859EF6C
+	obj_image_anim_frame 36, 5
+	obj_image_anim_end
+
+gUnknown_0859EF74:: @ 859EF74
+	obj_image_anim_frame 40, 5
+	obj_image_anim_end
+
+gUnknown_0859EF7C:: @ 859EF7C
+	obj_image_anim_frame 44, 5
+	obj_image_anim_end
+
+gUnknown_0859EF84:: @ 859EF84
+	obj_image_anim_frame 48, 5
+	obj_image_anim_end
+
+gUnknown_0859EF8C:: @ 859EF8C
+	obj_image_anim_frame 52, 5
+	obj_image_anim_end
+
+gUnknown_0859EF94:: @ 859EF94
+	obj_image_anim_frame 56, 5
+	obj_image_anim_end
+
+gUnknown_0859EF9C:: @ 859EF9C
+	obj_image_anim_frame 60, 5
+	obj_image_anim_end
 
 gUnknown_0859EFA4:: @ 859EFA4
-	.incbin "baserom.gba", 0x59efa4, 0x40
+	.4byte gUnknown_0859EF24
+	.4byte gUnknown_0859EF2C
+	.4byte gUnknown_0859EF34
+	.4byte gUnknown_0859EF3C
+	.4byte gUnknown_0859EF44
+	.4byte gUnknown_0859EF4C
+	.4byte gUnknown_0859EF54
+	.4byte gUnknown_0859EF5C
+	.4byte gUnknown_0859EF64
+	.4byte gUnknown_0859EF6C
+	.4byte gUnknown_0859EF74
+	.4byte gUnknown_0859EF7C
+	.4byte gUnknown_0859EF84
+	.4byte gUnknown_0859EF8C
+	.4byte gUnknown_0859EF94
+	.4byte gUnknown_0859EF9C

data/mystery_event_menu.s

@@ -4,7 +4,9 @@
 	.section .rodata
 
 gUnknown_085EFD64:: @ 85EFD64
-	.incbin "baserom.gba", 0x5efd64, 0x4
+	.4byte 0x1F8
 
 gUnknown_085EFD68:: @ 85EFD68
-	.incbin "baserom.gba", 0x5efd68, 0x18
+	window_template 0, 4, 15, 22, 4, 14, 20
+	window_template 0, 7, 6, 16, 4, 14, 0x6C
+	null_window_template

data/mystery_event_msg.s

@@ -1,96 +1,342 @@
+#include "constants/flags.h"
+#include "constants/items.h"
+#include "constants/moves.h"
+#include "constants/songs.h"
+#include "constants/species.h"
+#include "constants/vars.h"
 	.include "asm/macros.inc"
+	.include "asm/macros/event.inc"
 	.include "constants/constants.inc"
 
 	.section .rodata
-
-gText_MysteryGiftBerry:: @ 8674AE4
-	.string "Obtained a {STR_VAR_2} BERRY!\nDad has it at PETALBURG GYM.$"
-
-gText_MysteryGiftBerryTransform:: @ 8674B16
-	.string "The {STR_VAR_1} BERRY transformed into\none {STR_VAR_2} BERRY.$"
-
-gText_MysteryGiftBerryObtained:: @ 8674B42
-	.string "The {STR_VAR_1} BERRY has already been\nobtained.$"
-
-gText_MysteryGiftSpecialRibbon:: @ 8674B6A
-	.string "A special RIBBON was awarded to\nyour party POKéMON.$"
-
-gText_MysteryGiftNationalDex:: @ 8674B9E
-	.string "The POKéDEX has been upgraded\nwith the NATIONAL MODE.$"
-
-gText_MysteryGiftRareWord:: @ 8674BD4
-	.string "A rare word has been added.$"
-
-gText_MysteryGiftSentOver:: @ 8674BF0
-	.string "{STR_VAR_1} was sent over!$"
-
-gText_MysteryGiftFullParty:: @ 8674C02
-	.string "Your party is full.\n{STR_VAR_1} could not be sent over.$"
-
-gText_MysteryGiftNewTrainer:: @ 8674C31
-	.string "A new TRAINER has arrived in\nHOENN.$"
-	.string "A new adversary has arrived in the\nBATTLE TOWER.$"
-
-gText_MysteryGiftCantBeUsed:: @ 8674C86
-	.string "This data can’t be used in\nthis version.$"
 	
-gUnknown_08674CAF:: @ 8674CAF
+	.align 2
-	.incbin "baserom.gba", 0x00674caf, 0x2e
 
-gText_MysteryGiftStampCard::
+MysteryEventScript_StampCard:: @ 8674CB0
+	setvaddress MysteryEventScript_StampCard
+	setorcopyvar VAR_RESULT, 1
+	specialvar VAR_0x8008, sub_813986C
+	setorcopyvar VAR_RESULT, 0
+	specialvar VAR_0x8009, sub_813986C
+	subvar VAR_0x8008, 32777
+	buffernumberstring 0, VAR_0x8008
+	lock
+	faceplayer
+	vmessage sText_MysteryGiftStampCard
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+sText_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
+MysteryEventScript_SurfPichu:: @ 8674D3D
-	.incbin "baserom.gba", 0x00674d3d, 0xa1
+	setvaddress MysteryEventScript_SurfPichu
+	checkflag FLAG_MYSTERY_EVENT_DONE
+	vgoto_if 0, SurfPichu_GiveIfPossible
+	gotoram
 
-gText_MysteryGiftEgg::
+SurfPichu_GiveIfPossible: @ 8674D4C
+	specialvar VAR_EVENT_PICHU_SLOT, CalculatePlayerPartyCount
+	compare_var_to_value VAR_EVENT_PICHU_SLOT, 6
+	vgoto_if 1, SurfPichu_FullParty
+	setflag FLAG_MYSTERY_EVENT_DONE
+	vcall SurfPichu_GiveEgg
+	lock
+	faceplayer
+	vmessage sText_MysteryGiftEgg
+	waitmessage
+	waitbuttonpress
+	playfanfare MUS_FANFA4
+	waitfanfare
+	release
+	end
+
+SurfPichu_FullParty: @ 8674D73
+	lock
+	faceplayer
+	vmessage sText_FullParty
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+SurfPichu_GiveEgg: @ 8674D7E
+	giveegg SPECIES_PICHU
+	setmonobedient VAR_EVENT_PICHU_SLOT
+	setmonmetlocation VAR_EVENT_PICHU_SLOT, 255
+	compare_var_to_value VAR_EVENT_PICHU_SLOT, 1
+	vgoto_if 1, SurfPichu_Slot1
+	compare_var_to_value VAR_EVENT_PICHU_SLOT, 2
+	vgoto_if 1, SurfPichu_Slot2
+	compare_var_to_value VAR_EVENT_PICHU_SLOT, 3
+	vgoto_if 1, SurfPichu_Slot3
+	compare_var_to_value VAR_EVENT_PICHU_SLOT, 4
+	vgoto_if 1, SurfPichu_Slot4
+	compare_var_to_value VAR_EVENT_PICHU_SLOT, 5
+	vgoto_if 1, SurfPichu_Slot5
+	return
+
+SurfPichu_Slot1: @ 8674DC0
+	setmonmove 1, 2, MOVE_SURF
+	return
+
+SurfPichu_Slot2:: @ 8674DC6
+	setmonmove 2, 2, MOVE_SURF
+	return
+
+SurfPichu_Slot3: @ 8674DCC
+	setmonmove 3, 2, MOVE_SURF
+	return
+
+SurfPichu_Slot4: @ 8674DD2
+	setmonmove 4, 2, MOVE_SURF
+	return
+
+SurfPichu_Slot5: @ 8674DD8
+	setmonmove 5, 2, MOVE_SURF
+	return
+
+sText_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.$"
+	
+sText_FullParty:
 	.string "Oh, your party appears to be full.\pPlease come see me after storing\na POKéMON on a PC.$"
 
-gUnknown_08674EC1:: @ 8674EC1
+MysteryEventScript_VisitingTrainer:: @ 8674EC1
-	.incbin "baserom.gba", 0x00674ec1, 0x29
+	setvaddress MysteryEventScript_VisitingTrainer
+	special ValidateEReaderTrainer
+	compare_var_to_value VAR_RESULT, 0
+	vgoto_if 1, MysteryEventScript_VisitingTrainerArrived
+	lock
+	faceplayer
+	vmessage sText_MysteryGiftVisitingTrainer
+	waitmessage
+	waitbuttonpress
+	release
+	end
 
-gText_MysteryGiftVisitingTrainer::
+MysteryEventScript_VisitingTrainerArrived: @ 8674EDF
+	lock
+	faceplayer
+	vmessage sText_MysteryGiftVisitingTrainer_2
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+sText_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.$"
+
+sText_MysteryGiftVisitingTrainer_2:
 	.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
+MysteryEventScript_BattleCard:: @ 867513C
-	.incbin "baserom.gba", 0x0067513c, 0x48
+	setvaddress MysteryEventScript_BattleCard
+	checkflag FLAG_MYSTERY_EVENT_DONE
+	vgoto_if 1, MysteryEventScript_BattleCardInfo
+	setorcopyvar VAR_RESULT, 2
+	specialvar VAR_0x8008, sub_813986C
+	compare_var_to_value VAR_0x8008, 3
+	vgoto_if 0, MysteryEventScript_BattleCardInfo
+	lock
+	faceplayer
+	vmessage sText_MysteryGiftBattleCountCard_2
+	waitmessage
+	waitbuttonpress
+	giveitem_std ITEM_POTION
+	release
+	setflag FLAG_MYSTERY_EVENT_DONE
+	end
 
-gText_MysteryGiftBattleCountCard::
+MysteryEventScript_BattleCardInfo: @ 8675179
+	lock
+	faceplayer
+	vmessage sText_MysteryGiftBattleCountCard
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+sText_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!$"
+	
+sText_MysteryGiftBattleCountCard_2:
 	.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
+MysteryEventScript_AuroraTicket:: @ 867533C
-	.incbin "baserom.gba", 0x0067533c, 0x6d
+	setvaddress MysteryEventScript_AuroraTicket
+	lock
+	faceplayer
+	checkflag FLAG_0x13A
+	vgoto_if 1, AuroraTicket_Obtained
+	checkflag FLAG_0x1AD
+	vgoto_if 1, AuroraTicket_Obtained
+	checkitem ITEM_AURORA_TICKET, 1
+	compare_var_to_value VAR_RESULT, 1
+	vgoto_if 1, AuroraTicket_Obtained
+	vmessage sText_AuroraTicket1
+	waitmessage
+	waitbuttonpress
+	checkitemspace ITEM_AURORA_TICKET, 1
+	compare_var_to_value VAR_RESULT, 0
+	vgoto_if 1, AuroraTicket_NoBagSpace
+	giveitem_std ITEM_AURORA_TICKET
+	setflag FLAG_0x8D5
+	setflag FLAG_0x13A
+	vmessage sText_AuroraTicket2
+	waitmessage
+	waitbuttonpress
+	release
+	end
 
-gText_MysteryGiftTicket1::
+AuroraTicket_NoBagSpace: @ 8675397
+	vmessage sText_AuroraTicketNoPlace
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+AuroraTicket_Obtained: @ 86753A0
+	vmessage sText_AuroraTicketGot
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+sText_AuroraTicket1:
 	.string "Thank you for using the MYSTERY\nGIFT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$"
+	
+sText_AuroraTicket2:
 	.string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$"
+	
+sText_AuroraTicketGot:
 	.string "Thank you for using the MYSTERY\nGIFT System.$"
+	
+sText_AuroraTicketNoPlace:
 	.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
+MysteryEventScript_MysticTicket:: @ 867550B
-	.incbin "baserom.gba", 0x0067550b, 0x76
+	setvaddress MysteryEventScript_MysticTicket
+	lock
+	faceplayer
+	checkflag FLAG_0x13B
+	vgoto_if 1, MysticTicket_Obtained
+	checkflag FLAG_0x091
+	vgoto_if 1, MysticTicket_Obtained
+	checkflag FLAG_0x092
+	vgoto_if 1, MysticTicket_Obtained
+	checkitem ITEM_MYSTIC_TICKET, 1
+	compare_var_to_value VAR_RESULT, 1
+	vgoto_if 1, MysticTicket_Obtained
+	vmessage sText_MysticTicket2
+	waitmessage
+	waitbuttonpress
+	checkitemspace ITEM_MYSTIC_TICKET, 1
+	compare_var_to_value VAR_RESULT, 0
+	vgoto_if 1, MysticTicket_NoBagSpace
+	giveitem_std ITEM_MYSTIC_TICKET
+	setflag FLAG_0x8E0
+	setflag FLAG_0x13B
+	vmessage sText_MysticTicket1
+	waitmessage
+	waitbuttonpress
+	release
+	end
 
-gText_MysteryGiftTicket2::
+MysticTicket_NoBagSpace: @ 867556F
+	vmessage sText_MysticTicketNoPlace
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+MysticTicket_Obtained: @ 8675578
+	vmessage sText_MysticTicketGot
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+sText_MysticTicket2:
 	.string "Thank you for using the MYSTERY\nGIFT System.\pYou must be {PLAYER}.\nThere is a ticket here for you.$"
+	
+sText_MysticTicket1:
 	.string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$"
+	
+sText_MysticTicketGot:
 	.string "Thank you for using the MYSTERY\nGIFT System.$"
+	
+sText_MysticTicketNoPlace:
 	.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
+MysteryEventScript_AlteringCave:: @ 86756E3
-	.incbin "baserom.gba", 0x006756e3, 0x25
+	setvaddress MysteryEventScript_AlteringCave
+	addvar VAR_ALTERING_CAVE_WILD_SET, 1
+	compare_var_to_value VAR_ALTERING_CAVE_WILD_SET, 10
+	vgoto_if 0, MysteryEventScript_AlteringCave_
+	setvar VAR_ALTERING_CAVE_WILD_SET, 0
+MysteryEventScript_AlteringCave_: @ 86756FD
+	lock
+	faceplayer
+	vmessage sText_MysteryGiftAlteringCave
+	waitmessage
+	waitbuttonpress
+	release
+	end
 
-gText_MysteryGiftAlteringCave::
+sText_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
+MysteryEventScript_OldSeaMap:: @ 86757F4
-	.incbin "baserom.gba", 0x006757f4, 0x6d
+	setvaddress MysteryEventScript_OldSeaMap
+	lock
+	faceplayer
+	checkflag FLAG_0x13C
+	vgoto_if 1, OldSeaMap_Obtained
+	checkflag FLAG_0x1CA
+	vgoto_if 1, OldSeaMap_Obtained
+	checkitem ITEM_OLD_SEA_MAP, 1
+	compare_var_to_value VAR_RESULT, 1
+	vgoto_if 1, OldSeaMap_Obtained
+	vmessage sText_MysteryGiftOldSeaMap
+	waitmessage
+	waitbuttonpress
+	checkitemspace ITEM_OLD_SEA_MAP, 1
+	compare_var_to_value VAR_RESULT, 0
+	vgoto_if 1, OldSeaMap_NoBagSpace
+	giveitem_std ITEM_OLD_SEA_MAP
+	setflag FLAG_0x8D6
+	setflag FLAG_0x13C
+	vmessage sText_MysteryGiftOldSeaMap_1
+	waitmessage
+	waitbuttonpress
+	release
+	end
 
-gText_MysteryGiftOldSeaMap::
+OldSeaMap_NoBagSpace: @ 867584F
+	vmessage sText_MysteryGiftOldSeaMap_3
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+OldSeaMap_Obtained: @ 8675858
+	vmessage sText_MysteryGiftOldSeaMap_2
+	waitmessage
+	waitbuttonpress
+	release
+	end
+
+sText_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.$"
+
+sText_MysteryGiftOldSeaMap_1:
 	.string "It appears to be for use at the\nLILYCOVE CITY port.\pWhy not give it a try and see what\nit is about?$"
+
+sText_MysteryGiftOldSeaMap_2:
 	.string "Thank you for using the MYSTERY\nGIFT System.$"
+
+sText_MysteryGiftOldSeaMap_3:
 	.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/mystery_event_script_cmd_table.s

@@ -0,0 +1,22 @@
+	.section script_data, "aw", %progbits
+
+	.align 2
+gMysteryEventScriptCmdTable:: @ 82DED2C
+	.4byte MEScrCmd_nop
+	.4byte MEScrCmd_checkcompat
+	.4byte MEScrCmd_end
+	.4byte MEScrCmd_setmsg
+	.4byte MEScrCmd_setstatus
+	.4byte MEScrCmd_runscript
+	.4byte MEScrCmd_initramscript
+	.4byte MEScrCmd_setenigmaberry
+	.4byte MEScrCmd_giveribbon
+	.4byte MEScrCmd_givenationaldex
+	.4byte MEScrCmd_addrareword
+	.4byte MEScrCmd_setrecordmixinggift
+	.4byte MEScrCmd_givepokemon
+	.4byte MEScrCmd_addtrainer
+	.4byte MEScrCmd_enableresetrtc
+	.4byte MEScrCmd_checksum
+	.4byte MEScrCmd_crc
+gMysteryEventScriptCmdTableEnd::

data/new_menu_helpers.s

@@ -4,24 +4,50 @@
 	.section .rodata
 
 gUnknown_0860F074:: @ 860F074
-	.incbin "baserom.gba", 0x60f074, 0x20
+	.incbin "graphics/interface/860F074.gbapal"
 
 gUnknown_0860F094:: @ 860F094
-	.incbin "baserom.gba", 0x60f094, 0x4
+	.byte 8, 4, 1, 0
 
 gUnknown_0860F098:: @ 860F098
-	.incbin "baserom.gba", 0x60f098, 0x10
+	window_template 0, 2, 15, 27, 4, 15, 0x194
+	null_window_template
 
 gUnknown_0860F0A8:: @ 860F0A8
-	.incbin "baserom.gba", 0x60f0a8, 0x8
+	window_template 0, 21, 9, 5, 4, 15, 0x125
 
     @ These are not referenced in src/new_menu_helpers.c; rather, they are in src/menu.c.  Regardless, they were plopped here.
 
 gUnknown_0860F0B0:: @ 860F0B0
-	.incbin "baserom.gba", 0x60f0b0, 0x20
+	.incbin "graphics/interface/860F0B0.gbapal"
 
 gUnknown_0860F0D0:: @ 860F0D0
-	.incbin "baserom.gba", 0x60f0d0, 0x4
+	.byte 15, 1, 2, 0
 
 gUnknown_0860F0D4:: @ 860F0D4
-	.incbin "baserom.gba", 0x60f0d4, 0x68
+	.2byte 0xC0C, 0
+	.2byte 0xC20, 32
+	.2byte 0xC20, 100
+	.2byte 0xC20, 0x60
+	.2byte 0xC20, 0x80
+	.2byte 0xC20, 0x48
+	.2byte 0xC20, 0x44
+	.2byte 0xC20, 0x6C
+	.2byte 0xC20, 0x68
+	.2byte 0xC20, 0x88
+	.2byte 0xC20, 0xA4
+	.2byte 0xC20, 0x24
+	.2byte 0xC20, 0x28
+	.2byte 0xC20, 0x2C
+	.2byte 0xC20, 0x40
+	.2byte 0xC20, 0x84
+	.2byte 0xC20, 0x4C
+	.2byte 0xC20, 0xA0
+	.2byte 0xC20, 0x8C
+	.2byte 0xC2A, 0xA8
+	.2byte 0xC2A, 0xC0
+	.2byte 0xC2A, 0xC8
+	.2byte 0xC2A, 0xE0
+	.2byte 0xC2A, 0xE8
+	.2byte 0x808, 0xAE
+	.2byte 0x808, 0xAF

data/option_menu.s

@@ -1,20 +0,0 @@
-    .include "asm/macros.inc"
-    .include "constants/constants.inc"
-
-    .section .rodata
-    .align 2, 0
-
-gUnknown_0855C604:: @ 855C604
-	.incbin "baserom.gba", 0x55c604, 0x60
-
-gUnknown_0855C664:: @ 855C664
-	.incbin "baserom.gba", 0x55c664, 0x1c
-
-gUnknown_0855C680:: @ 855C680
-	.incbin "baserom.gba", 0x55c680, 0x18
-
-gUnknown_0855C698:: @ 855C698
-	.incbin "baserom.gba", 0x55c698, 0x8
-
-gUnknown_0855C6A0:: @ 855C6A0
-	.incbin "baserom.gba", 0x55c6a0, 0x4

data/overworld.s

@@ -4,22 +4,49 @@
     .section .rodata
     .align 2, 0
 gUnknown_08339D3C:: @ 8339D3C
-	.incbin "baserom.gba", 0x339d3c, 0x28
+	.4byte 0xFFFFFF, 0xFFFFFFFF, 0x4B0, 0xE10, 0x4B0, 0x960, 0x32, 0x50, 0xFFFFFFD4, 0x2C
 
 gUnknown_08339D64:: @ 8339D64
-	.incbin "baserom.gba", 0x339d64, 0x48
+	.4byte 0, 0
+	.4byte 0, 1
+	.4byte 0, -1
+	.4byte -1, 0
+	.4byte 1, 0
+	.4byte -1, 1
+	.4byte 1, 1
+	.4byte -1, -1
+	.4byte 1, -1
 
 gUnknown_08339DAC:: @ 8339DAC
-	.incbin "baserom.gba", 0x339dac, 0x10
+	.4byte 0x1F8
+	.4byte 0x11D1
+	.4byte 0x21C2
+	.4byte 0x31E3
 
 gUnknown_08339DBC:: @ 8339DBC
-	.incbin "baserom.gba", 0x339dbc, 0xc
+	.4byte REG_WIN0H
+	.4byte 0xa2600001
+	.byte 1, 0
 
+	.align 2
 gUnknown_08339DC8:: @ 8339DC8
-	.incbin "baserom.gba", 0x339dc8, 0xc
+	.4byte sub_80879D8
+	.4byte sub_80879F8
+	.4byte sub_80879FC
 
 gUnknown_08339DD4:: @ 8339DD4
-	.incbin "baserom.gba", 0x339dd4, 0x2c
+	.4byte sub_8087A1C
+	.4byte sub_8087A20
+	.4byte sub_8087A20
+	.4byte sub_8087A20
+	.4byte sub_8087A20
+	.4byte sub_8087A1C
+	.4byte sub_8087A1C
+	.4byte sub_8087A88
+	.4byte sub_8087A88
+	.4byte sub_8087A88
+	.4byte sub_8087A88
 
 gUnknown_08339E00:: @ 8339E00
-	.incbin "baserom.gba", 0x339e00, 0x8
+	.4byte sub_8087AA0
+	.4byte sub_8087AA8

data/pokemon_summary_screen.s

@@ -263,7 +263,7 @@ gSpriteAnimTable_861CF60:: @ 861CF60
 
 	.align 2
 gUnknown_0861CFBC:: @ 861CFBC
-	obj_tiles 0x08d971b0, 0x1700, 0x7532
+	obj_tiles gMoveTypes_Gfx, 0x1700, 0x7532
 
 	.align 2
 gUnknown_0861CFC4:: @ 861CFC4

data/record_mixing.s

@@ -5,16 +5,33 @@
 	.align 2, 0
 
 gUnknown_0858CF8C:: @ 858CF8C
-	.incbin "baserom.gba", 0x58cf8c, 0x2
+	.byte 1, 0
 
 gUnknown_0858CF8E:: @ 858CF8E
-	.incbin "baserom.gba", 0x58cf8e, 0x6
+	.byte 1, 2, 0
+	.byte 2, 0, 1
 
 gUnknown_0858CF94:: @ 858CF94
-	.incbin "baserom.gba", 0x58cf94, 0x24
+	.byte 1, 0, 3
+	.byte 2, 3, 0
+	.byte 1, 2, 2
+	.byte 0, 3, 1
+	.byte 1, 3, 0
+	.byte 2, 2, 3
+	.byte 0, 1, 3
+	.byte 2, 0, 1
+	.byte 1, 2, 3
+	.byte 0, 2, 3
+	.byte 1, 0, 3
+	.byte 2, 1, 0
 
 gUnknown_0858CFB8:: @ 858CFB8
-	.incbin "baserom.gba", 0x58cfb8, 0x6
+	.byte 0, 1
+	.byte 1, 2
+	.byte 2, 0
 
 gUnknown_0858CFBE:: @ 858CFBE
-	.incbin "baserom.gba", 0x58cfbe, 0xe
+	.byte 0, 1, 2, 3
+	.byte 0, 2, 1, 3
+	.byte 0, 3, 2, 1
+	.byte 0, 0

data/script_funcs.s

@@ -1,21 +0,0 @@
-	.section script_data, "aw", %progbits
-
-	.align 2
-gUnknown_082DED2C:: @ 82DED2C
-	.4byte sub_8153A80
-	.4byte sub_8153A30
-	.4byte script_status_stop_and_ret_1
-	.4byte sub_8153A94
-	.4byte sub_8153A84
-	.4byte sub_8153ACC
-	.4byte sub_8153BE4
-	.4byte sub_8153AE8
-	.4byte sub_8153BB0
-	.4byte sub_8153C4C
-	.4byte sub_8153C70
-	.4byte sub_8153C9C
-	.4byte sub_8153CC8
-	.4byte sub_8153DD4
-	.4byte sub_8153E1C
-	.4byte sub_8153E40
-	.4byte sub_8153E88

data/script_menu.s

@@ -578,7 +578,7 @@ gUnknown_0858B758:: @ 58B758
 
 
 gUnknown_0858B760:: @ 858B760
-	.4byte 0x0858abd8, 3
+	.4byte gUnknown_0858ABD8, 3
 	.4byte gUnknown_0858B758, 1
 	.4byte gUnknown_0858ABF0, 3
 	.4byte gUnknown_0858AC08, 4
@@ -745,19 +745,36 @@ gUnknown_0858BB80:: @ 858BB80
 	.4byte gText_Exit
 
 gUnknown_0858BB9C:: @ 858BB9C
-	.incbin "baserom.gba", 0x58bb9c, 0x10
+	.4byte OldaleTown_PokemonCenter_2F_Text_277F1B
+	.4byte OldaleTown_PokemonCenter_2F_Text_277F5A
+	.4byte OldaleTown_PokemonCenter_2F_Text_277F96
+	.4byte OldaleTown_PokemonCenter_2F_Text_27889C
 
 gUnknown_0858BBAC:: @ 858BBAC
-	.incbin "baserom.gba", 0x58bbac, 0x10
+	.4byte OldaleTown_PokemonCenter_2F_Text_27879F
+	.4byte OldaleTown_PokemonCenter_2F_Text_2787D5
+	.4byte OldaleTown_PokemonCenter_2F_Text_278831
+	.4byte OldaleTown_PokemonCenter_2F_Text_27889C
 
 gUnknown_0858BBBC:: @ 858BBBC
-	.incbin "baserom.gba", 0x58bbbc, 0x10
+	.4byte OldaleTown_PokemonCenter_2F_Text_27879F
+	.4byte OldaleTown_PokemonCenter_2F_Text_2787D5
+	.4byte OldaleTown_PokemonCenter_2F_Text_2787FC
+	.4byte OldaleTown_PokemonCenter_2F_Text_27889C
 
 gUnknown_0858BBCC:: @ 858BBCC
-	.incbin "baserom.gba", 0x58bbcc, 0x14
+	.4byte OldaleTown_PokemonCenter_2F_Text_27879F
+	.4byte OldaleTown_PokemonCenter_2F_Text_2787D5
+	.4byte OldaleTown_PokemonCenter_2F_Text_278831
+	.4byte OldaleTown_PokemonCenter_2F_Text_2787FC
+	.4byte OldaleTown_PokemonCenter_2F_Text_27889C
 
 gUnknown_0858BBE0:: @ 858BBE0
-	.incbin "baserom.gba", 0x58bbe0, 0xc
+	.4byte OldaleTown_PokemonCenter_2F_Text_277F1B
+	.4byte OldaleTown_PokemonCenter_2F_Text_277F5A
+	.4byte OldaleTown_PokemonCenter_2F_Text_27889C
 
 gUnknown_0858BBEC:: @ 858BBEC
-	.incbin "baserom.gba", 0x58bbec, 0xc
+	.4byte OldaleTown_PokemonCenter_2F_Text_27879F
+	.4byte OldaleTown_PokemonCenter_2F_Text_2787D5
+	.4byte OldaleTown_PokemonCenter_2F_Text_27889C

data/scripts/cable_club.inc

@@ -1648,15 +1648,15 @@ OldaleTown_PokemonCenter_2F_Text_277EF1: @ 8277EF1
 	.string "Which of our services do you wish\n"
 	.string "to use?$"
 
-OldaleTown_PokemonCenter_2F_Text_277F1B: @ 8277F1B
+OldaleTown_PokemonCenter_2F_Text_277F1B:: @ 8277F1B
 	.string "Trade POKéMON with another player\n"
 	.string "using a GBA Game Link cable.$"
 
-OldaleTown_PokemonCenter_2F_Text_277F5A: @ 8277F5A
+OldaleTown_PokemonCenter_2F_Text_277F5A:: @ 8277F5A
 	.string "You may battle another TRAINER\n"
 	.string "using a GBA Game Link cable.$"
 
-OldaleTown_PokemonCenter_2F_Text_277F96: @ 8277F96
+OldaleTown_PokemonCenter_2F_Text_277F96:: @ 8277F96
 	.string "You can use the RECORD CORNER with\n"
 	.string "others using a GBA Game Link cable.$"
 
@@ -1826,19 +1826,19 @@ OldaleTown_PokemonCenter_2F_Text_27878B: @ 827878B
 OldaleTown_PokemonCenter_2F_Text_278792: @ 8278792
 	.string "Please wait.$"
 
-OldaleTown_PokemonCenter_2F_Text_27879F: @ 827879F
+OldaleTown_PokemonCenter_2F_Text_27879F:: @ 827879F
 	.string "You may trade your POKéMON here\n"
 	.string "with another TRAINER.$"
 
-OldaleTown_PokemonCenter_2F_Text_2787D5: @ 82787D5
+OldaleTown_PokemonCenter_2F_Text_2787D5:: @ 82787D5
 	.string "You may battle with your friends\n"
 	.string "here.$"
 
-OldaleTown_PokemonCenter_2F_Text_2787FC: @ 82787FC
+OldaleTown_PokemonCenter_2F_Text_2787FC:: @ 82787FC
 	.string "Two to five TRAINERS can make\n"
 	.string "BERRY POWDER together.$"
 
-OldaleTown_PokemonCenter_2F_Text_278831: @ 8278831
+OldaleTown_PokemonCenter_2F_Text_278831:: @ 8278831
 	.string "The records of two to four players\n"
 	.string "can be mixed together.$"
 
@@ -1846,7 +1846,7 @@ OldaleTown_PokemonCenter_2F_Text_27886B: @ 827886B
 	.string "A guide to the WIRELESS CLUB’s\n"
 	.string "various services.$"
 
-OldaleTown_PokemonCenter_2F_Text_27889C: @ 827889C
+OldaleTown_PokemonCenter_2F_Text_27889C:: @ 827889C
 	.string "Cancels the selected MENU item.$"
 
 OldaleTown_PokemonCenter_2F_Text_2788BC: @ 82788BC

data/scripts/maps/PetalburgCity_Gym.inc

@@ -393,7 +393,7 @@ PetalburgCity_Gym_EventScript_204DCE:: @ 8204DCE
 	checkpcitem ITEM_ENIGMA_BERRY, 1
 	compare VAR_RESULT, 1
 	goto_eq PetalburgCity_Gym_EventScript_204E17
-	compare VAR_0x402D, 0
+	compare VAR_ENIGMA_BERRY_AVAILABLE, 0
 	goto_eq PetalburgCity_Gym_EventScript_204E17
 	msgbox PetalburgCity_Gym_Text_2A6D3D, 4
 	setvar VAR_RESULT, 1
@@ -407,7 +407,7 @@ PetalburgCity_Gym_EventScript_204E1D:: @ 8204E1D
 	giveitem_std ITEM_ENIGMA_BERRY
 	compare VAR_RESULT, 0
 	goto_eq PetalburgCity_Gym_EventScript_272054
-	setvar VAR_0x402D, 0
+	setvar VAR_ENIGMA_BERRY_AVAILABLE, 0
 	release
 	end
 

data/scripts/mauville_man.inc

@@ -300,10 +300,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "in hearing my epic tales of legendary\l"
 	.string "TRAINERS.$"
 
+MauvilleCity_PokemonCenter_1F_Text_28E930:: @ 828E930
 	.string "The Save-Happy TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28E947:: @ 828E947
 	.string "Saved the game$"
 
+MauvilleCity_PokemonCenter_1F_Text_28E956:: @ 828E956
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER saved the game\n"
@@ -311,10 +314,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "A more cautious TRAINER than\n"
 	.string "{STR_VAR_3} one will never find!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28E9D7:: @ 828E9D7
 	.string "The Trendsetter TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28E9EF:: @ 828E9EF
 	.string "Started trends$"
 
+MauvilleCity_PokemonCenter_1F_Text_28E9FE:: @ 828E9FE
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER started new trends\n"
@@ -322,10 +328,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} is setting trends for all\n"
 	.string "the HOENN region!$"
 
-	.string "The BERRY-Planting TRAINER$"
+MauvilleCity_PokemonCenter_1F_Text_28EA7D:: @ 828EA7D
+    .string "The BERRY-Planting TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EA98:: @ 828EA98
 	.string "Planted BERRIES$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EAA8:: @ 828EAA8
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER planted BERRIES\n"
@@ -333,10 +342,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} is a legendary lover of\n"
 	.string "BERRIES!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EB19:: @ 828EB19
 	.string "The BIKE-Loving TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EB31:: @ 828EB31
 	.string "Traded BIKES$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EB3E:: @ 828EB3E
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER swapped BIKES\n"
@@ -344,10 +356,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} must love BIKES deeply\n"
 	.string "and passionately!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EBB5:: @ 828EBB5
 	.string "The Interviewed TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EBCD:: @ 828EBCD
 	.string "Got interviewed$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EBDD:: @ 828EBDD
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER got interviewed\n"
@@ -355,20 +370,26 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} must be a TRAINER who’s\n"
 	.string "attracting much attention!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EC60:: @ 828EC60
 	.string "The Battle-Happy TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EC79:: @ 828EC79
 	.string "Battled$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EC81:: @ 828EC81
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER battled {STR_VAR_1} times!\p"
 	.string "{STR_VAR_3} must be a TRAINER who can\n"
 	.string "never refuse a chance to battle!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28ED04:: @ 828ED04
 	.string "The POKéMON-Catching TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28ED21:: @ 828ED21
 	.string "Caught POKéMON$"
 
+MauvilleCity_PokemonCenter_1F_Text_28ED30:: @ 828ED30
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER caught\n"
@@ -376,10 +397,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} is a legendary catcher of\n"
 	.string "wild POKéMON!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EDA1:: @ 828EDA1
 	.string "The Fishing TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EDB5:: @ 828EDB5
 	.string "Caught POKéMON with a ROD$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EDCF:: @ 828EDCF
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER caught\n"
@@ -387,10 +411,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} is a legendary fishing\n"
 	.string "expert!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EE45:: @ 828EE45
 	.string "The EGG-Warming TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EE5D:: @ 828EE5D
 	.string "Hatched EGGS$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EE6A:: @ 828EE6A
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER hatched {STR_VAR_1} POKéMON\n"
@@ -398,10 +425,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} is a legendary warmer\n"
 	.string "of EGGS!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EEDD:: @ 828EEDD
 	.string "The Evolver TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EEF1:: @ 828EEF1
 	.string "Evolved POKéMON$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EF01:: @ 828EF01
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER made {STR_VAR_1} POKéMON\n"
@@ -409,10 +439,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} is the ultimate evolver\n"
 	.string "of POKéMON!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EF73:: @ 828EF73
 	.string "The POKéMON CENTER-Loving TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EF95:: @ 828EF95
 	.string "Used POKéMON CENTERS$"
 
+MauvilleCity_PokemonCenter_1F_Text_28EFAA:: @ 828EFAA
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER healed POKéMON\n"
@@ -420,10 +453,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "There could be no greater lover of\n"
 	.string "POKéMON CENTERS than {STR_VAR_3}!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F045:: @ 828F045
 	.string "The Homebody TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F05A:: @ 828F05A
 	.string "Rested POKéMON at home$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F071:: @ 828F071
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER healed POKéMON\n"
@@ -431,10 +467,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "There could be no more of a homebody\n"
 	.string "than {STR_VAR_3}!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F0F3:: @ 828F0F3
 	.string "The SAFARI-Loving TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F10D:: @ 828F10D
 	.string "Entered the SAFARI ZONE$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F125:: @ 828F125
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER went into the SAFARI ZONE\n"
@@ -442,10 +481,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} is a TRAINER whose wild side\n"
 	.string "must come out in the SAFARI ZONE!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F1BE:: @ 828F1BE
 	.string "The CUT-Frenzy TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F1D5:: @ 828F1D5
 	.string "Used CUT$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F1DE:: @ 828F1DE
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER used CUT\n"
@@ -453,10 +495,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} is a TRAINER who just must\n"
 	.string "love to CUT!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F24F:: @ 828F24F
 	.string "The ROCK-SMASHING TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F269:: @ 828F269
 	.string "Smashed rocks$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F277:: @ 828F277
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER used ROCK SMASH\n"
@@ -464,10 +509,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} must be a TRAINER who\n"
 	.string "can’t leave a stone unsmashed!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F2FC:: @ 828F2FC
 	.string "The Move-Loving TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F314:: @ 828F314
 	.string "Moved the SECRET BASE$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F32A:: @ 828F32A
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER moved the SECRET BASE\n"
@@ -475,10 +523,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} is a TRAINER who loves\n"
 	.string "to move houses often!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F3AD:: @ 828F3AD
 	.string "The SPLASH-Happy TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F3C6:: @ 828F3C6
 	.string "Used SPLASH$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F3D2:: @ 828F3D2
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER used SPLASH\n"
@@ -486,10 +537,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} is a TRAINER who must love\n"
 	.string "SPLASHING around!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F44B:: @ 828F44B
 	.string "The Tenacious TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F461:: @ 828F461
 	.string "Resorted to using STRUGGLE$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F47C:: @ 828F47C
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER had to rely on STRUGGLE\n"
@@ -497,10 +551,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} is a tenacious TRAINER\n"
 	.string "who never gives in to adversity!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F50C:: @ 828F50C
 	.string "The SLOT Champ$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F51B:: @ 828F51B
 	.string "Won the jackpot on the SLOTS$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F538:: @ 828F538
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER won the jackpot on\n"
@@ -508,10 +565,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} is a TRAINER who was lucky\n"
 	.string "on the SLOTS!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F5BE:: @ 828F5BE
 	.string "The ROULETTE Champ$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F5D1:: @ 828F5D1
 	.string "Had consecutive ROULETTE wins of$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F5F2:: @ 828F5F2
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER won in ROULETTE\n"
@@ -519,10 +579,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} was lucky when the ball\n"
 	.string "bounced in ROULETTE!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F678:: @ 828F678
 	.string "The BATTLE TOWER Challenger$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F694:: @ 828F694
 	.string "Took the BATTLE TOWER challenge$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F6B4:: @ 828F6B4
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER took the BATTLE TOWER\n"
@@ -530,10 +593,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} is a TRAINER who aspires\n"
 	.string "for excellence in the BATTLE TOWER!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F751:: @ 828F751
 	.string "The Blend-Loving TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F76A:: @ 828F76A
 	.string "Made {POKEBLOCK}S$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F776:: @ 828F776
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER made {POKEBLOCK}S\n"
@@ -541,10 +607,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "There is none better at using a BERRY\n"
 	.string "BLENDER than {STR_VAR_3}!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F7F6:: @ 828F7F6
 	.string "The CONTEST-Loving TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F811:: @ 828F811
 	.string "Entered CONTESTS$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F822:: @ 828F822
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER entered CONTESTS\n"
@@ -552,10 +621,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} must love showing off\n"
 	.string "POKéMON to others!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F89C:: @ 828F89C
 	.string "The CONTEST Master$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F8AF:: @ 828F8AF
 	.string "Won CONTESTS$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F8BC:: @ 828F8BC
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER won CONTESTS\n"
@@ -563,10 +635,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} must be an incredible\n"
 	.string "CONTEST master!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F92F:: @ 828F92F
 	.string "The Happy Shopper$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F941:: @ 828F941
 	.string "Shopped$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F949:: @ 828F949
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER bought items in shops\n"
@@ -574,10 +649,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} must be one of those\n"
 	.string "people who are born to shop.$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F9D1:: @ 828F9D1
 	.string "The Item-Finding TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F9EA:: @ 828F9EA
 	.string "Used an ITEMFINDER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28F9FD:: @ 828F9FD
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER used an ITEMFINDER\n"
@@ -585,10 +663,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} must enjoy scouring the\n"
 	.string "ground for hidden items!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FA81:: @ 828FA81
 	.string "The Rain-Soaked TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FA99:: @ 828FA99
 	.string "Got rained on$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FAA7:: @ 828FAA7
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER got soaked by rain\n"
@@ -596,10 +677,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3}’s charisma must even\n"
 	.string "attract rain!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FB1D:: @ 828FB1D
 	.string "The Avid POKéDEX Reader$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FB35:: @ 828FB35
 	.string "Checked a POKéDEX$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FB47:: @ 828FB47
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER checked a POKéDEX\n"
@@ -607,10 +691,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} must love inspecting\n"
 	.string "POKéMON in a POKéDEX!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FBC4:: @ 828FBC4
 	.string "The RIBBON Collector$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FBD9:: @ 828FBD9
 	.string "Received RIBBONS$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FBEA:: @ 828FBEA
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER received RIBBONS\n"
@@ -618,10 +705,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} must be a TRAINER who\n"
 	.string "loves to collect RIBBONS!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FC6B:: @ 828FC6B
 	.string "The Ledge-Jumping TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FC85:: @ 828FC85
 	.string "Jumped down ledges$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FC98:: @ 828FC98
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER jumped down ledges\n"
@@ -629,20 +719,26 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "If there’s a ledge to be jumped,\n"
 	.string "{STR_VAR_3} can’t ignore it!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FD1D:: @ 828FD1D
 	.string "The Legendary TV Viewer$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FD35:: @ 828FD35
 	.string "Watched TV$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FD40:: @ 828FD40
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER watched TV\n"
 	.string "{STR_VAR_1} times!\p"
 	.string "{STR_VAR_3} must love watching TV!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FDA2:: @ 828FDA2
 	.string "The Time-Conscious TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FDBD:: @ 828FDBD
 	.string "Checked the time$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FDCE:: @ 828FDCE
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER checked the time\n"
@@ -650,10 +746,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} must be a punctual TRAINER\n"
 	.string "who’s conscious of the time.$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FE57:: @ 828FE57
 	.string "The POKéMON LOTTERY Wizard$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FE72:: @ 828FE72
 	.string "Won POKéMON LOTTERIES$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FE88:: @ 828FE88
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER won POKéMON LOTTERIES\n"
@@ -661,10 +760,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} must have many friends\n"
 	.string "to trade POKéMON with!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FF0C:: @ 828FF0C
 	.string "The DAY CARE-Using Trainer$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FF27:: @ 828FF27
 	.string "Left POKéMON at the DAY CARE$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FF44:: @ 828FF44
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER left POKéMON with the\n"
@@ -672,10 +774,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} must be a real go-getter\n"
 	.string "who raises POKéMON aggressively!$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FFDD:: @ 828FFDD
 	.string "The CABLE CAR-Loving TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_28FFFA:: @ 828FFFA
 	.string "Rode the CABLE CAR$"
 
+MauvilleCity_PokemonCenter_1F_Text_29000D:: @ 829000D
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER rode the CABLE CAR\n"
@@ -683,10 +788,13 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} must be a busy TRAINER\n"
 	.string "who’s up and down all the time!$"
 
+MauvilleCity_PokemonCenter_1F_Text_290097:: @ 8290097
 	.string "The Hot Spring-Loving TRAINER$"
 
+MauvilleCity_PokemonCenter_1F_Text_2900B5:: @ 82900B5
 	.string "Bathed in hot springs$"
 
+MauvilleCity_PokemonCenter_1F_Text_2900CB:: @ 82900CB
 	.string "This is a tale of a TRAINER\n"
 	.string "named {STR_VAR_3}.\p"
 	.string "This TRAINER bathed in hot springs\n"
@@ -694,6 +802,7 @@ MauvilleCity_PokemonCenter_1F_Text_28E8D9: @ 828E8D9
 	.string "{STR_VAR_3} must be a TRAINER with\n"
 	.string "baby-smooth skin!$"
 
+
 MauvilleCity_PokemonCenter_1F_EventScript_29014A:: @ 829014A
 	lock
 	faceplayer

data/specials.inc

@@ -1,4 +1,5 @@
 .macro def_special ptr
+.global SPECIAL_\ptr
 .set SPECIAL_\ptr, __special__
 .set __special__, __special__ + 1
 	.4byte \ptr
@@ -256,7 +257,7 @@ gSpecials:: @ 81DBA64
 	def_special sub_81B9B80
 	def_special sub_81B9D08
 	def_special sub_80F9490
-	def_special sub_81652B4
+	def_special ValidateEReaderTrainer
 	def_special sub_8139228
 	def_special sub_80F94E8
 	def_special sub_816AE58
@@ -272,7 +273,7 @@ gSpecials:: @ 81DBA64
 	def_special ShowBerryBlenderRecordWindow
 	def_special ResetTrickHouseEndRoomFlag
 	def_special SetTrickHouseEndRoomFlag
-	def_special sp109_CreatePCMenu
+	def_special ScrSpecial_CreatePCMenu
 	def_special AccessHallOfFamePC
 	def_special Special_ShowDiploma
 	def_special CheckLeadMonCool

data/strings.s

@@ -4379,25 +4379,25 @@ gText_ABtnTitleScreen:: @ 85EE572
 gText_Option:: @ 85EE589
 	.string "OPTION$"
 
-gUnknown_085EE590:: @ 85EE590
+gText_TextSpeed:: @ 85EE590
 	.string "TEXT SPEED$"
 
-gUnknown_085EE59B:: @ 85EE59B
+gText_BattleScene:: @ 85EE59B
 	.string "BATTLE SCENE$"
 
-gUnknown_085EE5A8:: @ 85EE5A8
+gText_BattleStyle:: @ 85EE5A8
 	.string "BATTLE STYLE$"
 
-gUnknown_085EE5B5:: @ 85EE5B5
+gText_Sound:: @ 85EE5B5
 	.string "SOUND$"
 
-gUnknown_085EE5BB:: @ 85EE5BB
+gText_Frame:: @ 85EE5BB
 	.string "FRAME$"
 
-gUnknown_085EE5C1:: @ 85EE5C1
+gText_OptionMenuCancel:: @ 85EE5C1
 	.string "CANCEL$"
 
-gUnknown_085EE5C8:: @ 85EE5C8
+gText_ButtonMode:: @ 85EE5C8
 	.string "BUTTON MODE$"
 
 gText_TextSpeedSlow:: @ 85EE5D4

data/text_window.s

@@ -1,196 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gTextWindowFrame1_Gfx:: @ 850E87C
-	.incbin "graphics/text_window/1.4bpp"
-
-	.align 2
-gTextWindowFrame2_Gfx:: @ 850E99C
-	.incbin "graphics/text_window/2.4bpp"
-
-	.align 2
-gTextWindowFrame3_Gfx:: @ 850EABC
-	.incbin "graphics/text_window/3.4bpp"
-
-	.align 2
-gTextWindowFrame4_Gfx:: @ 850EBDC
-	.incbin "graphics/text_window/4.4bpp"
-
-	.align 2
-gTextWindowFrame5_Gfx:: @ 850ECFC
-	.incbin "graphics/text_window/5.4bpp"
-
-	.align 2
-gTextWindowFrame6_Gfx:: @ 850EE1C
-	.incbin "graphics/text_window/6.4bpp"
-
-	.align 2
-gTextWindowFrame7_Gfx:: @ 850EF3C
-	.incbin "graphics/text_window/7.4bpp"
-
-	.align 2
-gTextWindowFrame8_Gfx:: @ 850F05C
-	.incbin "graphics/text_window/8.4bpp"
-
-	.align 2
-gTextWindowFrame9_Gfx:: @ 850F17C
-	.incbin "graphics/text_window/9.4bpp"
-
-	.align 2
-gTextWindowFrame10_Gfx:: @ 850F29C
-	.incbin "graphics/text_window/10.4bpp"
-
-	.align 2
-gTextWindowFrame11_Gfx:: @ 850F3BC
-	.incbin "graphics/text_window/11.4bpp"
-
-	.align 2
-gTextWindowFrame12_Gfx:: @ 850F4DC
-	.incbin "graphics/text_window/12.4bpp"
-
-	.align 2
-gTextWindowFrame13_Gfx:: @ 850F5FC
-	.incbin "graphics/text_window/13.4bpp"
-
-	.align 2
-gTextWindowFrame14_Gfx:: @ 850F71C
-	.incbin "graphics/text_window/14.4bpp"
-
-	.align 2
-gTextWindowFrame15_Gfx:: @ 850F83C
-	.incbin "graphics/text_window/15.4bpp"
-
-	.align 2
-gTextWindowFrame16_Gfx:: @ 850F95C
-	.incbin "graphics/text_window/16.4bpp"
-
-	.align 2
-gTextWindowFrame17_Gfx:: @ 850FA7C
-	.incbin "graphics/text_window/17.4bpp"
-
-	.align 2
-gTextWindowFrame18_Gfx:: @ 850FB9C
-	.incbin "graphics/text_window/18.4bpp"
-
-	.align 2
-gTextWindowFrame19_Gfx:: @ 850FCBC
-	.incbin "graphics/text_window/19.4bpp"
-
-	.align 2
-gTextWindowFrame20_Gfx:: @ 850FDDC
-	.incbin "graphics/text_window/20.4bpp"
-
-	.align 2
-gTextWindowFrame1_Pal:: @ 850FEFC
-	.incbin "graphics/text_window/1.gbapal"
-
-	.align 2
-gTextWindowFrame2_Pal:: @ 850FF1C
-	.incbin "graphics/text_window/2.gbapal"
-
-	.align 2
-gTextWindowFrame3_Pal:: @ 850FF3C
-	.incbin "graphics/text_window/3.gbapal"
-
-	.align 2
-gTextWindowFrame4_Pal:: @ 850FF5C
-	.incbin "graphics/text_window/4.gbapal"
-
-	.align 2
-gTextWindowFrame5_Pal:: @ 850FF7C
-	.incbin "graphics/text_window/5.gbapal"
-
-	.align 2
-gTextWindowFrame6_Pal:: @ 850FF9C
-	.incbin "graphics/text_window/6.gbapal"
-
-	.align 2
-gTextWindowFrame7_Pal:: @ 850FFBC
-	.incbin "graphics/text_window/7.gbapal"
-
-	.align 2
-gTextWindowFrame8_Pal:: @ 850FFDC
-	.incbin "graphics/text_window/8.gbapal"
-
-	.align 2
-gTextWindowFrame9_Pal:: @ 850FFFC
-	.incbin "graphics/text_window/9.gbapal"
-
-	.align 2
-gTextWindowFrame10_Pal:: @ 851001C
-	.incbin "graphics/text_window/10.gbapal"
-
-	.align 2
-gTextWindowFrame11_Pal:: @ 851003C
-	.incbin "graphics/text_window/11.gbapal"
-
-	.align 2
-gTextWindowFrame12_Pal:: @ 851005C
-	.incbin "graphics/text_window/12.gbapal"
-
-	.align 2
-gTextWindowFrame13_Pal:: @ 851007C
-	.incbin "graphics/text_window/13.gbapal"
-
-	.align 2
-gTextWindowFrame14_Pal:: @ 851009C
-	.incbin "graphics/text_window/14.gbapal"
-
-	.align 2
-gTextWindowFrame15_Pal:: @ 85100BC
-	.incbin "graphics/text_window/15.gbapal"
-
-	.align 2
-gTextWindowFrame16_Pal:: @ 85100DC
-	.incbin "graphics/text_window/16.gbapal"
-
-	.align 2
-gTextWindowFrame17_Pal:: @ 85100FC
-	.incbin "graphics/text_window/17.gbapal"
-
-	.align 2
-gTextWindowFrame18_Pal:: @ 851011C
-	.incbin "graphics/text_window/18.gbapal"
-
-	.align 2
-gTextWindowFrame19_Pal:: @ 851013C
-	.incbin "graphics/text_window/19.gbapal"
-
-	.align 2
-gTextWindowFrame20_Pal:: @ 851015C
-	.incbin "graphics/text_window/20.gbapal"
-
-	.align 2
-gUnknown_0851017C:: @ 851017C
-	.incbin "graphics/text_window/message_box.gbapal"
-
-	.incbin "graphics/text_window/text_pal1.gbapal"
-	.incbin "graphics/text_window/text_pal2.gbapal"
-	.incbin "graphics/text_window/text_pal3.gbapal"
-	.incbin "graphics/text_window/text_pal4.gbapal"
-
-	.align 2
-gUnknown_0851021C:: @ 851021C
-	.4byte gTextWindowFrame1_Gfx, gTextWindowFrame1_Pal
-	.4byte gTextWindowFrame2_Gfx, gTextWindowFrame2_Pal
-	.4byte gTextWindowFrame3_Gfx, gTextWindowFrame3_Pal
-	.4byte gTextWindowFrame4_Gfx, gTextWindowFrame4_Pal
-	.4byte gTextWindowFrame5_Gfx, gTextWindowFrame5_Pal
-	.4byte gTextWindowFrame6_Gfx, gTextWindowFrame6_Pal
-	.4byte gTextWindowFrame7_Gfx, gTextWindowFrame7_Pal
-	.4byte gTextWindowFrame8_Gfx, gTextWindowFrame8_Pal
-	.4byte gTextWindowFrame9_Gfx, gTextWindowFrame9_Pal
-	.4byte gTextWindowFrame10_Gfx, gTextWindowFrame10_Pal
-	.4byte gTextWindowFrame11_Gfx, gTextWindowFrame11_Pal
-	.4byte gTextWindowFrame12_Gfx, gTextWindowFrame12_Pal
-	.4byte gTextWindowFrame13_Gfx, gTextWindowFrame13_Pal
-	.4byte gTextWindowFrame14_Gfx, gTextWindowFrame14_Pal
-	.4byte gTextWindowFrame15_Gfx, gTextWindowFrame15_Pal
-	.4byte gTextWindowFrame16_Gfx, gTextWindowFrame16_Pal
-	.4byte gTextWindowFrame17_Gfx, gTextWindowFrame17_Pal
-	.4byte gTextWindowFrame18_Gfx, gTextWindowFrame18_Pal
-	.4byte gTextWindowFrame19_Gfx, gTextWindowFrame19_Pal
-	.4byte gTextWindowFrame20_Gfx, gTextWindowFrame20_Pal

data/unk_transition.s

@@ -4,13 +4,14 @@
 	.section .rodata
 
 gUnknown_0862AD54:: @ 862AD54
-	.incbin "baserom.gba", 0x62ad54, 0x1dc
+	.incbin "graphics/battle_transitions/frontier_transition.4bpp.lz"
 
 gUnknown_0862AF30:: @ 862AF30
-	 .incbin "baserom.gba", 0x62af30, 0x1AC
+	.incbin "graphics/battle_transitions/frontier_transition.bin"
 
 gUnknown_0862B0DC:: @ 862B0DC
-	 .incbin "baserom.gba", 0x62b0dc, 0x460
+	.incbin "graphics/battle_transitions/frontier_transition_circles.4bpp.lz"
 
 gUnknown_0862B53C:: @ 862B53C
-	 .incbin "baserom.gba", 0x62b53c, 0x1E0
+	.incbin "graphics/battle_transitions/frontier_transition.gbapal"
+	.space 0x1c0