Merge with master

.travis/calcrom/calcrom.pl

@@ -1,5 +1,7 @@
 #!/usr/bin/perl
 
+use IPC::Cmd qw[ run ];
+
 (@ARGV == 1)
     or die "ERROR: no map file specified.\n";
 open(my $file, $ARGV[0])
@@ -7,7 +9,6 @@ open(my $file, $ARGV[0])
 
 my $src = 0;
 my $asm = 0;
-my $undocumented = 0;
 while (my $line = <$file>)
 {
     if ($line =~ /^ \.(\w+)\s+0x[0-9a-f]+\s+(0x[0-9a-f]+) (\w+)\/.+\.o/)
@@ -28,19 +29,92 @@ while (my $line = <$file>)
             }
         }
     }
-    if($line =~ /^\s+0x([0-9A-f]+)\s+[A-z_]+([0-9A-f]+)/) {
-        my $thing1 = sprintf("%08X", hex($1));
-        my $thing2 = sprintf("%08X", hex($2));
-        if($thing1 eq $thing2) {
-            $undocumented += 1;
-        }
-    }
 }
 
+# Note that the grep filters out all branch labels. It also requires a minimum
+# line length of 5, to filter out a ton of generated symbols (like AcCn). No
+# settings to nm seem to remove these symbols. Finally, nm prints out a separate
+# entry for whenever a name appears in a file, not just where it's defined. uniq
+# removes all the duplicate entries.
+#
+#
+# You'd expect this to take a while, because of uniq. It runs in under a second,
+# though. Uniq is pretty fast!
+my $base_cmd = "nm pokeemerald.elf | awk '{print \$3}' | grep '^[^_].\\{4\\}' | uniq";
+
+# This looks for Unknown_, Unknown_, or sub_, followed by just numbers. Note that
+# it matches even if stuff precedes the unknown, like sUnknown/gUnknown.
+my $undoc_cmd = "grep '[Uu]nknown_[0-9a-fA-F]*\\|sub_[0-9a-fA-F]*'";
+
+# This looks for every symbol with an address at the end of it. Some things are
+# given a name based on their type / location, but still have an unknown purpose.
+# For example, FooMap_EventScript_FFFFFFF.
+my $partial_doc_cmd = "grep '[0-9a-fA-F]\\{6,7\\}'";
+
+my $count_cmd = "wc -l";
+
+# It sucks that we have to run this three times, but I can't figure out how to get
+# stdin working for subcommands in perl while still having a timeout. It's decently
+# fast anyway.
+my $total_syms_as_string;
+(run (
+    command => "$base_cmd | $count_cmd",
+    buffer => \$total_syms_as_string,
+    timeout => 60
+))
+    or die "ERROR: Error while getting all symbols: $?";
+
+my $undocumented_as_string;
+(run (
+    command => "$base_cmd | $undoc_cmd | $count_cmd",
+    buffer => \$undocumented_as_string,
+    timeout => 60
+))
+    or die "ERROR: Error while filtering for undocumented symbols: $?";
+
+my $partial_documented_as_string;
+(run (
+    command => "$base_cmd | $partial_doc_cmd | $count_cmd",
+    buffer => \$partial_documented_as_string,
+    timeout => 60
+))
+    or die "ERROR: Error while filtering for partial symbols: $?";
+
+# Performing addition on a string converts it to a number. Any string that fails
+# to convert to a number becomes 0. So if our converted number is 0, but our string
+# is nonzero, then the conversion was an error.
+my $undocumented = $undocumented_as_string + 0;
+(($undocumented != 0) and ($undocumented_as_string ne "0"))
+    or die "ERROR: Cannot convert string to num: '$undocumented_as_string'";
+
+my $partial_documented = $partial_documented_as_string + 0;
+(($partial_documented != 0) and ($partial_documented_as_string ne "0"))
+	or die "ERROR: Cannot convert string to num: '$partial_documented_as_string'";
+
+my $total_syms = $total_syms_as_string + 0;
+(($total_syms != 0) and ($total_syms_as_string ne "0"))
+    or die "ERROR: Cannot convert string to num: '$total_syms_as_string'";
+
+($total_syms != 0)
+    or die "ERROR: No symbols found.";
+
 my $total = $src + $asm;
 my $srcPct = sprintf("%.4f", 100 * $src / $total);
 my $asmPct = sprintf("%.4f", 100 * $asm / $total);
+
+# partial_documented is double-counting the unknown_* and sub_* symbols.
+$partial_documented = $partial_documented - $undocumented;
+
+my $documented = $total_syms - ($undocumented + $partial_documented);
+my $docPct = sprintf("%.4f", 100 * $documented / $total_syms);
+my $partialPct = sprintf("%.4f", 100 * $partial_documented / $total_syms);
+my $undocPct = sprintf("%.4f", 100 * $undocumented / $total_syms);
+
 print "$total total bytes of code\n";
 print "$src bytes of code in src ($srcPct%)\n";
 print "$asm bytes of code in asm ($asmPct%)\n";
-print "$undocumented global symbols undocumented\n";
+print "\n";
+print "$total_syms total symbols\n";
+print "$documented symbols documented ($docPct%)\n";
+print "$partial_documented symbols partially documented ($partialPct%)\n";
+print "$undocumented symbols undocumented ($undocPct%)\n";

INSTALL.md

@@ -66,6 +66,14 @@ cd ../pokeemerald
 
 And build the ROM with `make`.
 
+If the step `./build.sh` in the above list of commands fails with the error `Makefile:1: /opt/devkitpro/devkitARM/base_tools: No such file or directory`, then try installing the pacman package `devkitarm-rules` by executing the command
+
+```
+sudo dkp-pacman -S devkitarm-rules
+```
+
+Executing `./build.sh` again should now succeed.
+
 # Faster builds
 
 After the first build, subsequent builds are faster. You can further speed up the build:

Makefile

@@ -159,7 +159,7 @@ $(C_BUILDDIR)/%.o : $(C_SUBDIR)/%.c $$(c_dep)
 ifeq ($(NODEP),1)
 $(ASM_BUILDDIR)/%.o: asm_dep :=
 else
-$(ASM_BUILDDIR)/%.o: asm_dep = $(shell $(SCANINC) $(ASM_SUBDIR)/$*.s)
+$(ASM_BUILDDIR)/%.o: asm_dep = $(shell $(SCANINC) -I "" $(ASM_SUBDIR)/$*.s)
 endif
 
 $(ASM_BUILDDIR)/%.o: $(ASM_SUBDIR)/%.s $$(asm_dep)
@@ -168,7 +168,7 @@ $(ASM_BUILDDIR)/%.o: $(ASM_SUBDIR)/%.s $$(asm_dep)
 ifeq ($(NODEP),1)
 $(DATA_ASM_BUILDDIR)/%.o: data_dep :=
 else
-$(DATA_ASM_BUILDDIR)/%.o: data_dep = $(shell $(SCANINC) $(DATA_ASM_SUBDIR)/$*.s)
+$(DATA_ASM_BUILDDIR)/%.o: data_dep = $(shell $(SCANINC) -I include -I "" $(DATA_ASM_SUBDIR)/$*.s)
 endif
 
 $(DATA_ASM_BUILDDIR)/%.o: $(DATA_ASM_SUBDIR)/%.s $$(data_dep)

asmdiff.ps1

@@ -0,0 +1,114 @@
+Param
+(
+    [Parameter(Position = 0)]
+    [string]$Start,
+
+    [Parameter(Position = 1)]
+    [string]$Offset,
+
+    [Parameter()]
+    [string[]]$DiffTool
+)
+
+$ErrorActionPreference = "Stop"
+
+$offset_default_value = "0x100"
+$diff_tool_default_value = "diff"
+
+$help = "
+$($args[0]) [OPTIONS] Start [Offset]
+
+Performs a diff on the assembly of a function in a rom. 'Start' is the start
+location of the function, and 'Offset' is the number of bytes to disassemble.
+The assembly is saved to *.dump files.
+
+'Offset' is optional, and defaults to $offset_default_value. If this value is
+very large (0x10000+), objdump may hang / freeze.
+
+Requirements:
+    - A clean copy of the rom named 'baserom.gba'.
+    - $$ENV:DEVKITARM to point to the installation of devkitpro. By default, it is
+      installed to 'C:\devkitpro\devkitARM'.
+
+Options:
+    -DiffTool <tool>   The tool to use for diffing. Defaults to '$diff_tool_default_value'. For VSCode,
+                       you can use -DiffTool 'code --diff'. (Quotes are necessary around 'code --diff')
+"
+
+if ((-not (Test-Path variable:Start)) -or [string]::IsNullOrWhiteSpace($Start))
+{
+    Write-Host $help
+    exit
+}
+
+if (-not (Test-Path variable:DiffTool) -or [string]::IsNullOrWhiteSpace($DiffTool))
+{
+    $DiffTool = $diff_tool_default_value
+}
+
+if (-not (Test-Path variable:Offset) -or [string]::IsNullOrWhiteSpace($Offset))
+{
+    $Offset = $offset_default_value
+}
+
+if (-Not (Test-Path env:DEVKITARM))
+{
+    Write-Host "ENV:DEVKITARM variable not set."
+    Write-Host $help
+    exit
+}
+
+if (-Not (Test-Path $env:DEVKITARM))
+{
+    Write-Host "DEVKITARM path '$env:DEVKITARM' does not exist."
+    Write-Host $help
+    exit
+}
+
+if (-Not (Test-Path ".\pokeemerald.gba"))
+{
+    Write-Host "File 'pokeemerald.gba' not found."
+    Write-Host $help
+    exit
+}
+
+if (-Not (Test-Path ".\baserom.gba"))
+{
+    Write-Host "File 'baserom.gba' not found."
+}
+
+try
+{
+    $start_num = [System.Convert]::ToUInt64($Start, 16)
+}
+catch
+{
+    Write-Host "Error parsing '$start_num' as a hex number."
+    Write-Host $help
+    exit
+}
+
+try
+{
+    $offset_num = [System.Convert]::ToUInt64($Offset, 16)
+}
+catch
+{
+    Write-Host "Error parsing '$offset_num' as a hex number."
+    Write-Host $help
+    exit
+}
+
+if ($start_num -gt 0x1000000)
+{
+    Write-Host "Warning: Start address is larger than the ROM file. Hint: ignore the leading number in the address."
+}
+
+$end_str = [System.Convert]::ToString($start_num + $offset_num, 16)
+$end_str = "0x$end_str"
+
+Write-Host "$Start - $end_str"
+$objdump = Join-Path -Path $env:DEVKITARM -ChildPath "arm-none-eabi\bin\objdump.exe"
+&$objdump -D -bbinary -marmv4t -Mforce-thumb --start-address="$Start" --stop-address="$end_str" .\baserom.gba > .\baserom.dump
+&$objdump -D -bbinary -marmv4t -Mforce-thumb --start-address="$Start" --stop-address="$end_str" .\pokeemerald.gba > .\pokeemerald.dump
+Invoke-Expression "$DiffTool .\baserom.dump .\pokeemerald.dump"

data/ereader.s

@@ -3,200 +3,6 @@
 
 	.section .rodata
 
-gUnknown_086253E8:: @ 86253E8
-	.4byte 0x8010100
-	.4byte 0x80F02
-	.4byte 0x8011500
-	.4byte 0x180F12
-	.4byte 0xB010100
-	.4byte 0x180F08
-
-gUnknown_08625400:: @ 8625400
-	.byte 1, 2, 3
-
-gUnknown_08625403:: @ 8625403
-	.byte 0xFF
-
-gUnknown_08625404:: @ 8625404
-	.byte 0x40, 0, 0, 4, 1, 0, 0x60, 0xA6, 1, 0, 0, 0
-
-gUnknown_08625410:: @ 8625410
-	.byte 4, 5, 6, 7, 8, 9, 9, 0xA, 0xA, 0xB, 0xB, 0xC, 0xC, 0xD, 0xD, 0xD, 0xD, 0xE, 0xE, 0xE, 0xE, 0xF, 0xF, 0xF, 0xF, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x12, 0x12, 0x12, 0x12, 0x12, 0x12, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x13, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x14, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x15, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x16, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x17, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x18, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x19, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1A, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1B, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1C, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1D, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1E, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x1F, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x21, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x23
-
-gUnknown_08625510:: @ 8625510
-	.4byte 0x10010101
-	.4byte 0xA0F0C
-	.4byte 0x10010101
-	.4byte 0xCA0F0C
-	.4byte 0xA011301
-	.4byte 0x18A0F0C
-	.4byte 0x160F0401
-	.4byte 0x2020F04
-	.4byte 0x5081600
-	.4byte 0x25A0F04
-	.4byte 0xFF
-	.4byte NULL
-
-gUnknown_08625540:: @ 8625540
-	.4byte 0x5081600
-	.4byte 0x25A0F04
-
-gUnknown_08625548:: @ 8625548
-	.4byte NULL
-	.4byte sub_81D2BD0
-	.4byte NULL
-	.2byte 0
-	.2byte 0
-	.byte 2
-	.byte 0
-	.byte 8
-	.byte 0
-	.4byte 0x1003121
-	
-gUnknown_08625560:: @ 8625560
-	.incbin "graphics/pokenav/pokeball.4bpp"
-
-gUnknown_08625660:: @ 8625660
-	.incbin "graphics/pokenav/8625660.4bpp"
-	
-gUnknown_08625680:: @ 8625680
-	.incbin "graphics/pokenav/sparkle.gbapal"
-	
-gUnknown_086256A0:: @ 86255A0
-	.incbin "graphics/pokenav/sparkle.4bpp"
-	
-gUnknown_08625A20:: @ 8625A20
-	.2byte 0
-	.2byte 0xC000
-	.2byte 0x400
-	.2byte 0
-	
-gUnknown_08625A28:: @ 8625A28
-	.2byte 0
-	.2byte 0x4000
-	.2byte 0x800
-	.2byte 0
-	
-gUnknown_08625A30:: @ 8625A30
-	.2byte 0
-	.2byte 5
-	.2byte 0xFFFF
-	.2byte 0
-	
-gUnknown_08625A38:: @ 8625A38
-	.2byte 4
-	.2byte 5
-	.2byte 0xFFFF
-	.2byte 0
-	
-gUnknown_08625A40:: @ 8625A40
-	.4byte gUnknown_08625A30
-	.4byte gUnknown_08625A38
-
-gUnknown_08625A48:: @ 8625A48
-	.4byte NULL
-	.4byte 0x640800
-
-gUnknown_08625A50:: @ 8625A50
-	spr_template 0x64, 0x64, gUnknown_08625A20, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gUnknown_08625A68:: @ 8625A68
-	.4byte NULL
-	.4byte 0x64
-
-gUnknown_08625A70:: @ 8625A70
-	.4byte gUnknown_08625560
-	.byte 0, 1, 0x65, 0
-	.4byte gUnknown_08625660
-	.2byte 0x20, 0x67
-	.4byte gPokenavConditionCancel_Gfx
-	.byte 0, 1, 0x66, 0
-	.4byte NULL, NULL
-
-gUnknown_08625A90:: @ 8625A90
-	.4byte gPokenavConditionCancel_Pal + 0x0
-	.byte 0x65, 0, 0, 0
-	.4byte gPokenavConditionCancel_Pal + 0x20
-	.byte 0x66, 0, 0, 0
-	.4byte NULL, NULL
-
-gUnknown_08625AA8:: @ 8625AA8
-	spr_template 0x65, 0x65, gUnknown_08625A28, gUnknown_08625A40, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-gUnknown_08625AC0:: @ 8625AC0
-	.4byte gUnknown_086256A0
-	.byte 0x80, 3, 0x68, 0
-
-gUnknown_08625AC8:: @ 8625AC8
-	.4byte gUnknown_08625680
-	.byte 0x68, 0, 0, 0
-	
-gUnknown_08625AD0:: @ 8625AD0
-	.2byte 0
-	.2byte 0x4000
-	.2byte 0
-	.2byte 0
-	
-gUnknown_08625AD8:: @ 8625AD8
-	.2byte 0
-	.2byte 5
-	.2byte 4
-	.2byte 5
-	
-gUnknown_08625AE0:: @ 8625AE0
-	.2byte 8
-	.2byte 5
-	.2byte 12
-	.2byte 5
-	
-gUnknown_08625AE8:: @ 8625AE8
-	.2byte 16
-	.2byte 5
-	.2byte 20
-	.2byte 5
-	
-gUnknown_08625AF0:: @ 8625AF0
-	.2byte 24
-	.2byte 5
-	.2byte 0xFFFF
-	.2byte 0
-	
-gUnknown_08625AF8:: @ 8625AF8
-	.4byte gUnknown_08625AD8
-	.4byte gUnknown_08625AE0
-	
-gUnknown_08625B00:: @ 8625B00
-	.4byte gUnknown_08625AE8
-	.4byte gUnknown_08625AF0
-	
-gUnknown_08625B08:: @ 8625B08
-	.4byte gUnknown_08625AF8
-	.4byte gUnknown_08625B00
-	.4byte gUnknown_08625B08
-
-gUnknown_08625B14:: @ 8625B14
-	spr_template 0x68, 0x68, gUnknown_08625AD0, gUnknown_08625AF8, NULL gDummySpriteAffineAnimTable, sub_81D3564
-
-gUnknown_08625B2C:: @ 8625B2C
-	.2byte 0, 0xFFDD
-	.2byte 20, 0xFFE4
-	.2byte 33, 0xFFF6
-	.2byte 33, 10
-	.2byte 20, 28
-	.2byte 0, 35
-	.2byte 0xFFEC, 28
-	.2byte 0xFFDF, 10
-	.2byte 0xFFDF, 0xFFF6
-	.2byte 0xFFEC, 0xFFE4
-
-gUnknown_08625B54:: @ 8625B54
-	.4byte gUnknown_085EEA46
-	.4byte gUnknown_085EEA4E
-	.4byte gUnknown_085EEA55
-	.4byte gUnknown_085EEA63
-	.4byte gUnknown_085EEA6B
-	.4byte gUnknown_085EEA5D
-
 gUnknown_08625B6C:: @ 8625B6C
 @ apparently e-reader trainer data? idk
 .byte 0x6f, 0x57, 0x54, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x0c, 0x01, 0x00, 0x00, 0x00, 0x2e, 0x14, 0x0c, 0x0e, 0x23, 0x10, 0x47, 0x0a, 0x1f, 0x06, 0x24, 0x0e, 0x48, 0x0a, 0x0f, 0x06

data/event_scripts.s

@@ -3161,7 +3161,7 @@ Route118_EventScript_273D13:: @ 8273D13
 Route125_EventScript_273D13:: @ 8273D13
 Route127_EventScript_273D13:: @ 8273D13
 Route129_EventScript_273D13:: @ 8273D13
-	setflag FLAG_SPECIAL_FLAG_0x4000
+	setflag FLAG_HIDE_MAP_NAME_POPUP
 	return
 
 UnusualWeather_StartKyogreWeather:: @ 8273D17
@@ -3188,7 +3188,7 @@ UnusualWeather_EventScript_EndEventAndCleanup_2:: @ 8273D31
 	special DrawWholeMapView
 	setvar VAR_UNUSUAL_WEATHER_LOCATION, UNUSUAL_WEATHER_NONE
 	setvar VAR_SHOULD_END_UNUSUAL_WEATHER, 0
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	fadescreenswapbuffers 0
 	releaseall
 	end

data/maps/BattleFrontier_BattlePyramidEmptySquare/map.json

@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE",
   "name": "BattleFrontier_BattlePyramidEmptySquare",
   "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_EMPTY_SQUARE",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",

data/maps/BattleFrontier_BattlePyramidTop/map.json

@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP",
   "name": "BattleFrontier_BattlePyramidTop",
   "layout": "LAYOUT_BATTLE_FRONTIER_BATTLE_PYRAMID_TOP",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_BATTLE_FRONTIER",
   "requires_flash": false,
   "weather": "WEATHER_NONE",

data/maps/BattlePyramidSquare01/map.json

@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_PYRAMID_SQUARE01",
   "name": "BattlePyramidSquare01",
   "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE01",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",

data/maps/BattlePyramidSquare02/map.json

@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_PYRAMID_SQUARE02",
   "name": "BattlePyramidSquare02",
   "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE02",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",

data/maps/BattlePyramidSquare03/map.json

@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_PYRAMID_SQUARE03",
   "name": "BattlePyramidSquare03",
   "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE03",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",

data/maps/BattlePyramidSquare04/map.json

@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_PYRAMID_SQUARE04",
   "name": "BattlePyramidSquare04",
   "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE04",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",

data/maps/BattlePyramidSquare05/map.json

@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_PYRAMID_SQUARE05",
   "name": "BattlePyramidSquare05",
   "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE05",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",

data/maps/BattlePyramidSquare06/map.json

@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_PYRAMID_SQUARE06",
   "name": "BattlePyramidSquare06",
   "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE06",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",

data/maps/BattlePyramidSquare07/map.json

@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_PYRAMID_SQUARE07",
   "name": "BattlePyramidSquare07",
   "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE07",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",

data/maps/BattlePyramidSquare08/map.json

@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_PYRAMID_SQUARE08",
   "name": "BattlePyramidSquare08",
   "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE08",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",

data/maps/BattlePyramidSquare09/map.json

@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_PYRAMID_SQUARE09",
   "name": "BattlePyramidSquare09",
   "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE09",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",

data/maps/BattlePyramidSquare10/map.json

@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_PYRAMID_SQUARE10",
   "name": "BattlePyramidSquare10",
   "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE10",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",

data/maps/BattlePyramidSquare11/map.json

@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_PYRAMID_SQUARE11",
   "name": "BattlePyramidSquare11",
   "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE11",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",

data/maps/BattlePyramidSquare12/map.json

@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_PYRAMID_SQUARE12",
   "name": "BattlePyramidSquare12",
   "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE12",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",

data/maps/BattlePyramidSquare13/map.json

@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_PYRAMID_SQUARE13",
   "name": "BattlePyramidSquare13",
   "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE13",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",

data/maps/BattlePyramidSquare14/map.json

@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_PYRAMID_SQUARE14",
   "name": "BattlePyramidSquare14",
   "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE14",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",

data/maps/BattlePyramidSquare15/map.json

@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_PYRAMID_SQUARE15",
   "name": "BattlePyramidSquare15",
   "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE15",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",

data/maps/BattlePyramidSquare16/map.json

@@ -2,7 +2,7 @@
   "id": "MAP_BATTLE_PYRAMID_SQUARE16",
   "name": "BattlePyramidSquare16",
   "layout": "LAYOUT_BATTLE_PYRAMID_SQUARE16",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_DYNAMIC",
   "requires_flash": false,
   "weather": "WEATHER_NONE",

data/maps/BirthIsland_Exterior/map.json

@@ -2,7 +2,7 @@
   "id": "MAP_BIRTH_ISLAND_EXTERIOR",
   "name": "BirthIsland_Exterior",
   "layout": "LAYOUT_BIRTH_ISLAND_EXTERIOR",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_BIRTH_ISLAND_2",
   "requires_flash": false,
   "weather": "WEATHER_NONE",

data/maps/BirthIsland_Harbor/map.json

@@ -2,7 +2,7 @@
   "id": "MAP_BIRTH_ISLAND_HARBOR",
   "name": "BirthIsland_Harbor",
   "layout": "LAYOUT_ISLAND_HARBOR",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_BIRTH_ISLAND_2",
   "requires_flash": false,
   "weather": "WEATHER_NONE",

data/maps/CaveOfOrigin_B1F/map.json

@@ -2,7 +2,7 @@
   "id": "MAP_CAVE_OF_ORIGIN_B1F",
   "name": "CaveOfOrigin_B1F",
   "layout": "LAYOUT_CAVE_OF_ORIGIN_B1F",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_CAVE_OF_ORIGIN",
   "requires_flash": false,
   "weather": "WEATHER_FOG_1",

data/maps/FallarborTown_House2/scripts.inc

@@ -37,7 +37,7 @@ FallarborTown_House2_EventScript_2013D6:: @ 82013D6
 
 FallarborTown_House2_EventScript_20140C:: @ 820140C
 	msgbox FallarborTown_House2_Text_2015C3, MSGBOX_DEFAULT
-	special TeachMoveTutorMove
+	special TeachMoveRelearnerMove
 	waitstate
 	compare VAR_0x8004, 0
 	goto_if_eq FallarborTown_House2_EventScript_2013D6

data/maps/InsideOfTruck/map.json

@@ -2,7 +2,7 @@
   "id": "MAP_INSIDE_OF_TRUCK",
   "name": "InsideOfTruck",
   "layout": "LAYOUT_INSIDE_OF_TRUCK",
-  "music": "65535",
+  "music": "MUS_NONE",
   "region_map_section": "MAPSEC_INSIDE_OF_TRUCK",
   "requires_flash": false,
   "weather": "WEATHER_NONE",

data/maps/InsideOfTruck/scripts.inc

@@ -15,7 +15,7 @@ InsideOfTruck_MapScript1_23BF01: @ 823BF01
 
 InsideOfTruck_EventScript_23BF04:: @ 823BF04
 	lockall
-	setflag FLAG_SPECIAL_FLAG_0x4000
+	setflag FLAG_HIDE_MAP_NAME_POPUP
 	checkplayergender
 	compare VAR_RESULT, MALE
 	goto_if_eq InsideOfTruck_EventScript_23BF20

data/maps/LavaridgeTown/scripts.inc

@@ -37,7 +37,7 @@ LavaridgeTown_EventScript_1EA53F:: @ 81EA53F
 	return
 
 LavaridgeTown_EventScript_1EA543:: @ 81EA543
-	setflag FLAG_SPECIAL_FLAG_0x4000
+	setflag FLAG_HIDE_MAP_NAME_POPUP
 	return
 
 LavaridgeTown_MapScript2_1EA547: @ 81EA547
@@ -95,7 +95,7 @@ LavaridgeTown_EventScript_1EA5FF:: @ 81EA5FF
 	call_if_ne LavaridgeTown_EventScript_1EA6C9
 	removeobject 7
 	setvar VAR_LAVARIDGE_RIVAL_STATE, 2
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	savebgm MUS_DUMMY
 	fadedefaultbgm
 	releaseall

data/maps/LittlerootTown/scripts.inc

@@ -31,7 +31,7 @@ LittlerootTown_EventScript_1E7E45:: @ 81E7E45
 	return
 
 LittlerootTown_EventScript_1E7E4B:: @ 81E7E4B
-	setflag FLAG_SPECIAL_FLAG_0x4000
+	setflag FLAG_HIDE_MAP_NAME_POPUP
 	return
 
 LittlerootTown_EventScript_1E7E4F:: @ 81E7E4F
@@ -141,7 +141,7 @@ LittlerootTown_EventScript_1E7F17:: @ 81E7F17
 	closedoor VAR_0x8004, VAR_0x8005
 	waitdooranim
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_FAT_MAN
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	return
 
 LittlerootTown_Movement_1E7F98: @ 81E7F98
@@ -194,7 +194,7 @@ LittlerootTown_EventScript_1E7FB1:: @ 81E7FB1
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_RIVAL
 	clearflag FLAG_HIDE_LITTLEROOT_TOWN_BIRCH
 	delay 20
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	warp MAP_LITTLEROOT_TOWN_PROFESSOR_BIRCHS_LAB, 255, 6, 5
 	waitstate
 	releaseall

data/maps/PetalburgCity/scripts.inc

@@ -20,7 +20,7 @@ PetalburgCity_EventScript_1DC307:: @ 81DC307
 	return
 
 PetalburgCity_EventScript_1DC30F:: @ 81DC30F
-	setflag FLAG_SPECIAL_FLAG_0x4000
+	setflag FLAG_HIDE_MAP_NAME_POPUP
 	savebgm MUS_TSURETEK
 	return
 
@@ -48,7 +48,7 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E
 	waitmovement 2, MAP_PETALBURG_CITY
 	msgbox PetalburgCity_Text_1EC297, MSGBOX_DEFAULT
 	closemessage
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	setvar VAR_PETALBURG_STATE, 3
 	fadedefaultbgm
 	clearflag FLAG_SPECIAL_FLAG_0x4001
@@ -61,7 +61,7 @@ PetalburgCity_EventScript_1DC32E:: @ 81DC32E
 
 PetalburgCity_EventScript_1DC390:: @ 81DC390
 	lockall
-	setflag FLAG_SPECIAL_FLAG_0x4000
+	setflag FLAG_HIDE_MAP_NAME_POPUP
 	applymovement 5, PetalburgCity_Movement_1DC41B
 	applymovement EVENT_OBJ_ID_PLAYER, PetalburgCity_Movement_1DC406
 	waitmovement 0
@@ -76,7 +76,7 @@ PetalburgCity_EventScript_1DC390:: @ 81DC390
 	hideobjectat EVENT_OBJ_ID_PLAYER, MAP_PETALBURG_CITY
 	closedoor VAR_0x8004, VAR_0x8005
 	waitdooranim
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	fadedefaultbgm
 	clearflag FLAG_SPECIAL_FLAG_0x4001
 	warp MAP_PETALBURG_CITY_WALLYS_HOUSE, 255, 2, 4

data/maps/Route101/scripts.inc

@@ -12,7 +12,7 @@ Route101_MapScript2_1EBCCB: @ 81EBCCB
 	.2byte 0
 
 Route101_EventScript_1EBCD5:: @ 81EBCD5
-	setflag FLAG_SPECIAL_FLAG_0x4000
+	setflag FLAG_HIDE_MAP_NAME_POPUP
 	setvar VAR_ROUTE101_STATE, 1
 	end
 
@@ -236,7 +236,7 @@ Route101_EventScript_1EBE16:: @ 81EBE16
 	setflag FLAG_HIDE_ROUTE_101_BIRCH_STARTERS_BAG
 	setvar VAR_BIRCH_LAB_STATE, 2
 	setvar VAR_ROUTE101_STATE, 3
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	checkplayergender
 	compare VAR_RESULT, MALE
 	call_if_eq Route101_EventScript_1EBE85

data/maps/Route128/scripts.inc

@@ -73,7 +73,7 @@ Route128_EventScript_1F6B57:: @ 81F6B57
 	delay 15
 	removeobject 3
 	waitfieldeffect 30
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	setvar VAR_ROUTE128_STATE, 2
 	releaseall
 	end

data/maps/RustboroCity/scripts.inc

@@ -24,7 +24,7 @@ RustboroCity_EventScript_1E06FF:: @ 81E06FF
 	end
 
 RustboroCity_EventScript_1E0707:: @ 81E0707
-	setflag FLAG_SPECIAL_FLAG_0x4000
+	setflag FLAG_HIDE_MAP_NAME_POPUP
 	return
 
 RustboroCity_MapScript2_1E070B: @ 81E070B
@@ -100,7 +100,7 @@ RustboroCity_EventScript_1E07BD:: @ 81E07BD
 	removeobject 15
 	setflag FLAG_HIDE_RUSTBORO_CITY_SCIENTIST
 	setvar VAR_RUSTBORO_STATE, 7
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	releaseall
 	end
 

data/maps/SeafloorCavern_Room9/scripts.inc

@@ -140,7 +140,7 @@ SeafloorCavern_Room9_EventScript_234DC9:: @ 8234DC9
 	setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_MAGMA_GRUNTS
 	setflag FLAG_HIDE_SEAFLOOR_CAVERN_ROOM_9_KYOGRE_1
 	setflag FLAG_HIDE_SEAFLOOR_CAVERN_AQUA_GRUNTS
-	setflag FLAG_SPECIAL_FLAG_0x4000
+	setflag FLAG_HIDE_MAP_NAME_POPUP
 	warp MAP_ROUTE128, 255, 38, 22
 	waitstate
 	releaseall

data/maps/SkyPillar_Outside/scripts.inc

@@ -12,7 +12,7 @@ SkyPillar_Outside_MapScript1_2392B8: @ 82392B8
 	end
 
 SkyPillar_Outside_EventScript_2392CF:: @ 82392CF
-	setflag FLAG_SPECIAL_FLAG_0x4000
+	setflag FLAG_HIDE_MAP_NAME_POPUP
 	return
 
 SkyPillar_Outside_EventScript_2392D3:: @ 82392D3
@@ -81,7 +81,7 @@ SkyPillar_Outside_EventScript_239304:: @ 8239304
 	closemessage
 	playse SE_KAIDAN
 	fadescreenswapbuffers 1
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	setvar VAR_RAYQUAZA_STATE, 4
 	removeobject 1
 	clearflag FLAG_HIDE_SOOTOPOLIS_CITY_WALLACE

data/maps/SlateportCity/scripts.inc

@@ -36,7 +36,7 @@ SlateportCity_EventScript_1DCC99:: @ 81DCC99
 	return
 
 SlateportCity_EventScript_1DCCE7:: @ 81DCCE7
-	setflag FLAG_SPECIAL_FLAG_0x4000
+	setflag FLAG_HIDE_MAP_NAME_POPUP
 	getplayerxy VAR_0x8004, VAR_0x8005
 	compare VAR_0x8004, 30
 	goto_if_eq SlateportCity_EventScript_1DCD06
@@ -83,7 +83,7 @@ SlateportCity_EventScript_1DCD1C:: @ 81DCD1C
 	removeobject 35
 	setobjectxyperm 35, 10, 12
 	setobjectmovementtype 35, MOVEMENT_TYPE_FACE_DOWN
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	setvar VAR_SLATEPORT_OUTSIDE_MUSEUM_STATE, 2
 	addvar VAR_SCOTT_STATE, 1
 	releaseall

data/maps/SootopolisCity/scripts.inc

@@ -62,7 +62,7 @@ SootopolisCity_MapScript1_1E56EF: @ 81E56EF
 	end
 
 SootopolisCity_EventScript_1E5781:: @ 81E5781
-	setflag FLAG_SPECIAL_FLAG_0x4000
+	setflag FLAG_HIDE_MAP_NAME_POPUP
 	return
 
 SootopolisCity_EventScript_1E5785:: @ 81E5785
@@ -272,7 +272,7 @@ SootopolisCity_EventScript_1E5946:: @ 81E5946
 	waitmovement 0
 	special RemoveCameraObject
 	setvar VAR_RAYQUAZA_STATE, 2
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	releaseall
 	end
 
@@ -372,7 +372,7 @@ SootopolisCity_EventScript_1E5A82:: @ 81E5A82
 	waitmovement 0
 	special RemoveCameraObject
 	setvar VAR_RAYQUAZA_STATE, 2
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	releaseall
 	end
 
@@ -544,7 +544,7 @@ SootopolisCity_EventScript_1E5C1E:: @ 81E5C1E
 	clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS
 	fadenewbgm MUS_RUNECITY
 	delay 120
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	warp8 MAP_SOOTOPOLIS_CITY, 255, 43, 32
 	waitstate
 	end
@@ -597,7 +597,7 @@ SootopolisCity_EventScript_1E5CCE:: @ 81E5CCE
 	clearflag FLAG_LEGENDARIES_IN_SOOTOPOLIS
 	fadenewbgm MUS_NAMINORI
 	delay 120
-	clearflag FLAG_SPECIAL_FLAG_0x4000
+	clearflag FLAG_HIDE_MAP_NAME_POPUP
 	warp8 MAP_SOOTOPOLIS_CITY, 255, 29, 53
 	waitstate
 	end

data/menu_specialized.s

@@ -0,0 +1,148 @@
+	.include "asm/macros.inc"
+	.include "constants/constants.inc"
+
+	.section .rodata
+	
+gUnknown_08625560:: @ 8625560
+	.incbin "graphics/pokenav/pokeball.4bpp"
+
+gUnknown_08625660:: @ 8625660
+	.incbin "graphics/pokenav/pokeball_placeholder.4bpp"
+	
+gUnknown_08625680:: @ 8625680
+	.incbin "graphics/pokenav/sparkle.gbapal"
+	
+gUnknown_086256A0:: @ 86255A0
+	.incbin "graphics/pokenav/sparkle.4bpp"
+	
+gUnknown_08625A20:: @ 8625A20
+	.2byte 0
+	.2byte 0xC000
+	.2byte 0x400
+	.2byte 0
+	
+gUnknown_08625A28:: @ 8625A28
+	.2byte 0
+	.2byte 0x4000
+	.2byte 0x800
+	.2byte 0
+	
+gUnknown_08625A30:: @ 8625A30
+	.2byte 0
+	.2byte 5
+	.2byte 0xFFFF
+	.2byte 0
+	
+gUnknown_08625A38:: @ 8625A38
+	.2byte 4
+	.2byte 5
+	.2byte 0xFFFF
+	.2byte 0
+	
+gUnknown_08625A40:: @ 8625A40
+	.4byte gUnknown_08625A30
+	.4byte gUnknown_08625A38
+
+gUnknown_08625A48:: @ 8625A48
+	.4byte NULL
+	.4byte 0x640800
+
+gUnknown_08625A50:: @ 8625A50
+	spr_template 0x64, 0x64, gUnknown_08625A20, gDummySpriteAnimTable, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+
+gUnknown_08625A68:: @ 8625A68
+	.4byte NULL
+	.4byte 0x64
+
+gUnknown_08625A70:: @ 8625A70
+	.4byte gUnknown_08625560
+	.byte 0, 1, 0x65, 0
+	.4byte gUnknown_08625660
+	.2byte 0x20, 0x67
+	.4byte gPokenavConditionCancel_Gfx
+	.byte 0, 1, 0x66, 0
+	.4byte NULL, NULL
+
+gUnknown_08625A90:: @ 8625A90
+	.4byte gPokenavConditionCancel_Pal + 0x0
+	.byte 0x65, 0, 0, 0
+	.4byte gPokenavConditionCancel_Pal + 0x20
+	.byte 0x66, 0, 0, 0
+	.4byte NULL, NULL
+
+gUnknown_08625AA8:: @ 8625AA8
+	spr_template 0x65, 0x65, gUnknown_08625A28, gUnknown_08625A40, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
+
+gUnknown_08625AC0:: @ 8625AC0
+	.4byte gUnknown_086256A0
+	.byte 0x80, 3, 0x68, 0
+
+gUnknown_08625AC8:: @ 8625AC8
+	.4byte gUnknown_08625680
+	.byte 0x68, 0, 0, 0
+	
+gUnknown_08625AD0:: @ 8625AD0
+	.2byte 0
+	.2byte 0x4000
+	.2byte 0
+	.2byte 0
+	
+gUnknown_08625AD8:: @ 8625AD8
+	.2byte 0
+	.2byte 5
+	.2byte 4
+	.2byte 5
+	
+gUnknown_08625AE0:: @ 8625AE0
+	.2byte 8
+	.2byte 5
+	.2byte 12
+	.2byte 5
+	
+gUnknown_08625AE8:: @ 8625AE8
+	.2byte 16
+	.2byte 5
+	.2byte 20
+	.2byte 5
+	
+gUnknown_08625AF0:: @ 8625AF0
+	.2byte 24
+	.2byte 5
+	.2byte 0xFFFF
+	.2byte 0
+	
+gUnknown_08625AF8:: @ 8625AF8
+	.4byte gUnknown_08625AD8
+	.4byte gUnknown_08625AE0
+	
+gUnknown_08625B00:: @ 8625B00
+	.4byte gUnknown_08625AE8
+	.4byte gUnknown_08625AF0
+	
+gUnknown_08625B08:: @ 8625B08
+	.4byte gUnknown_08625AF8
+	.4byte gUnknown_08625B00
+	.4byte gUnknown_08625B08
+
+gUnknown_08625B14:: @ 8625B14
+	spr_template 0x68, 0x68, gUnknown_08625AD0, gUnknown_08625AF8, NULL gDummySpriteAffineAnimTable, sub_81D3564
+
+gUnknown_08625B2C:: @ 8625B2C
+	.2byte 0, 0xFFDD
+	.2byte 20, 0xFFE4
+	.2byte 33, 0xFFF6
+	.2byte 33, 10
+	.2byte 20, 28
+	.2byte 0, 35
+	.2byte 0xFFEC, 28
+	.2byte 0xFFDF, 10
+	.2byte 0xFFDF, 0xFFF6
+	.2byte 0xFFEC, 0xFFE4
+
+gUnknown_08625B54:: @ 8625B54
+	.4byte gUnknown_085EEA46
+	.4byte gUnknown_085EEA4E
+	.4byte gUnknown_085EEA55
+	.4byte gUnknown_085EEA63
+	.4byte gUnknown_085EEA6B
+	.4byte gUnknown_085EEA5D

data/specials.inc

@@ -235,7 +235,7 @@ gSpecials:: @ 81DBA64
 	def_special sub_81B9770
 	def_special sub_81B9718
 	def_special sub_81B96D0
-	def_special TeachMoveTutorMove
+	def_special TeachMoveRelearnerMove
 	def_special GetRecordedCyclingRoadResults
 	def_special Special_BeginCyclingRoadChallenge
 	def_special GetPlayerAvatarBike