Merge branch 'master' of github.com:pret/pokeruby into flying

23 files changed, 59 insertions, 80 deletions

diff --git a/data/battle_anim_813F0F4.s b/data/battle_anim_813F0F4.s
index fd24d95b6..b043929c3 100644
--- a/data/battle_anim_813F0F4.s
+++ b/data/battle_anim_813F0F4.s
@@ -4,7 +4,7 @@
 	.section .rodata
 
 	.align 2
-gUnknown_0840B258:: @ 840B258
+gBallOpenParticleSpritesheets:: @ 840B258
 	obj_tiles gBattleAnimSpriteSheet_Particles, 0x100, 55020
 	obj_tiles gBattleAnimSpriteSheet_Particles, 0x100, 55021
 	obj_tiles gBattleAnimSpriteSheet_Particles, 0x100, 55022
@@ -19,7 +19,7 @@ gUnknown_0840B258:: @ 840B258
 	obj_tiles gBattleAnimSpriteSheet_Particles, 0x100, 55031
 
 	.align 2
-gUnknown_0840B2B8:: @ 840B2B8
+gBallOpenParticlePalettes:: @ 840B2B8
 	obj_pal gBattleAnimSpritePalette_136, 55020
 	obj_pal gBattleAnimSpritePalette_136, 55021
 	obj_pal gBattleAnimSpritePalette_136, 55022
@@ -78,70 +78,48 @@ gSpriteAnimTable_840B360:: @ 840B360
 	.4byte gSpriteAnim_840B34C
 	.4byte gSpriteAnim_840B358
 
-gUnknown_0840B378:: @ 840B378
-	.byte 0, 0, 0, 5, 1, 2, 2, 3, 5, 5, 4, 4
-
-	.align 2
-gUnknown_0840B384:: @ 840B384
-	.4byte sub_8140930
-	.4byte sub_8140DC4
-	.4byte sub_8140C14
-	.4byte sub_8140CE8
-	.4byte sub_8141058
-	.4byte sub_8140C14
-	.4byte sub_8140B3C
-	.4byte sub_8140CE8
-	.4byte sub_8140F24
-	.4byte sub_8140A64
-	.4byte sub_8140DC4
-	.4byte sub_8141164
-
-	.align 2
-gSpriteTemplate_840B3B4:: @ 840B3B4
+gBallOpenParticleAnimNums:: @ 840B378
+	.byte 0
+	.byte 0
+	.byte 0
+	.byte 5
+	.byte 1
+	.byte 2
+	.byte 2
+	.byte 3
+	.byte 5
+	.byte 5
+	.byte 4
+	.byte 4
+
+	.align 2
+gBallOpenParticleAnimationFuncs:: @ 840B384
+	.4byte PokeBallOpenParticleAnimation
+	.4byte GreatBallOpenParticleAnimation
+	.4byte SafariBallOpenParticleAnimation
+	.4byte UltraBallOpenParticleAnimation
+	.4byte MasterBallOpenParticleAnimation
+	.4byte SafariBallOpenParticleAnimation
+	.4byte DiveBallOpenParticleAnimation
+	.4byte UltraBallOpenParticleAnimation
+	.4byte RepeatBallOpenParticleAnimation
+	.4byte TimerBallOpenParticleAnimation
+	.4byte GreatBallOpenParticleAnimation
+	.4byte PremierBallOpenParticleAnimation
+
+	.align 2
+gSpriteTemplates_840B3B4:: @ 840B3B4
 	spr_template 55020, 55020, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gSpriteTemplate_840B3CC:: @ 840B3CC
 	spr_template 55021, 55021, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gSpriteTemplate_840B3E4:: @ 840B3E4
 	spr_template 55022, 55022, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gSpriteTemplate_840B3FC:: @ 840B3FC
 	spr_template 55023, 55023, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gSpriteTemplate_840B414:: @ 840B414
 	spr_template 55024, 55024, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gSpriteTemplate_840B42C:: @ 840B42C
 	spr_template 55025, 55025, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gSpriteTemplate_840B444:: @ 840B444
 	spr_template 55026, 55026, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gSpriteTemplate_840B45C:: @ 840B45C
 	spr_template 55027, 55027, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gSpriteTemplate_840B474:: @ 840B474
 	spr_template 55028, 55028, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gSpriteTemplate_840B48C:: @ 840B48C
 	spr_template 55029, 55029, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gSpriteTemplate_840B4A4:: @ 840B4A4
 	spr_template 55030, 55030, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-
-	.align 2
-gSpriteTemplate_840B4BC:: @ 840B4BC
 	spr_template 55031, 55031, gOamData_837DF24, gSpriteAnimTable_840B360, NULL, gDummySpriteAffineAnimTable, SpriteCallbackDummy
 
 	.align 1
diff --git a/data/event_scripts.s b/data/event_scripts.s
index 3ce319397..eef08bb79 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -10,6 +10,7 @@
 #include "constants/songs.h"
 #include "constants/species.h"
 #include "constants/weather.h"
+#include "constants/heal_locations.h"
 #include "constants/vars.h"
 	.include "include/macros.inc"
 	.include "include/macros/event.inc"
diff --git a/data/graphics.s b/data/graphics.s
index f48723501..587be6df0 100644
--- a/data/graphics.s
+++ b/data/graphics.s
@@ -4039,8 +4039,8 @@ gUnknown_08E96D2C:: @ 8E96D2C
 	.incbin "graphics/unknown/unknown_E96D2C.bin.lz"
 
 	.align 2
-gUnknown_08E96EC8:: @ 8E96EC8
-	.incbin "graphics/unknown/unknown_E96EC8.bin"
+gBagScreenLabels_Tilemap:: @ 8E96EC8
+	.incbin "graphics/interface/bag_screen_labels.bin"
 
 	.align 2
 gSlotMachineSpritePalette0:: @ 8E976C8
diff --git a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc
index 33d14e770..38f242eab 100644
--- a/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/DewfordTown_PokemonCenter_1F/scripts.inc
@@ -3,7 +3,7 @@ DewfordTown_PokemonCenter_1F_MapScripts:: @ 8153014
 	.byte 0
 
 DewfordTown_PokemonCenter_1F_MapScript1_15301A:: @ 815301A
-	setrespawn 15
+	setrespawn HEAL_LOCATION_DEWFORD_TOWN
 	call DewfordTown_PokemonCenter_1F_EventScript_19FD1B
 	end
 
diff --git a/data/maps/EverGrandeCity_HallOfFame/scripts.inc b/data/maps/EverGrandeCity_HallOfFame/scripts.inc
index 6cfc5ae27..4b54204d3 100644
--- a/data/maps/EverGrandeCity_HallOfFame/scripts.inc
+++ b/data/maps/EverGrandeCity_HallOfFame/scripts.inc
@@ -51,7 +51,7 @@ EverGrandeCity_HallOfFame_EventScript_15BBA8:: @ 815BBA8
 	end
 
 EverGrandeCity_HallOfFame_EventScript_15BC41:: @ 815BC41
-	setrespawn 1
+	setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F
 	fadescreenspeed 1, 24
 	special GameClear
 	waitstate
@@ -59,7 +59,7 @@ EverGrandeCity_HallOfFame_EventScript_15BC41:: @ 815BC41
 	end
 
 EverGrandeCity_HallOfFame_EventScript_15BC4D:: @ 815BC4D
-	setrespawn 2
+	setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F
 	fadescreenspeed 1, 24
 	special GameClear
 	waitstate
diff --git a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
index 374ef9472..3c0ad3732 100644
--- a/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/EverGrandeCity_PokemonCenter_1F/scripts.inc
@@ -3,7 +3,7 @@ EverGrandeCity_PokemonCenter_1F_MapScripts:: @ 815BC66
 	.byte 0
 
 EverGrandeCity_PokemonCenter_1F_MapScript1_15BC6C:: @ 815BC6C
-	setrespawn 11
+	setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_1
 	end
 
 EverGrandeCity_PokemonCenter_1F_EventScript_15BC70:: @ 815BC70
diff --git a/data/maps/EverGrandeCity_PokemonLeague/scripts.inc b/data/maps/EverGrandeCity_PokemonLeague/scripts.inc
index a48cf278e..6da717d06 100644
--- a/data/maps/EverGrandeCity_PokemonLeague/scripts.inc
+++ b/data/maps/EverGrandeCity_PokemonLeague/scripts.inc
@@ -3,7 +3,7 @@ EverGrandeCity_PokemonLeague_MapScripts:: @ 815BA75
 	.byte 0
 
 EverGrandeCity_PokemonLeague_MapScript1_15BA7B:: @ 815BA7B
-	setrespawn 20
+	setrespawn HEAL_LOCATION_EVER_GRANDE_CITY_2
 	setflag FLAG_SYS_POKEMON_LEAGUE_FLY
 	call_if_unset FLAG_ENTERED_ELITE_FOUR, EverGrandeCity_PokemonLeague_EventScript_15BA8B
 	end
diff --git a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
index 6ae897ec8..801f704e3 100644
--- a/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/FallarborTown_PokemonCenter_1F/scripts.inc
@@ -3,7 +3,7 @@ FallarborTown_PokemonCenter_1F_MapScripts:: @ 8153AF3
 	.byte 0
 
 FallarborTown_PokemonCenter_1F_MapScript1_153AF9:: @ 8153AF9
-	setrespawn 17
+	setrespawn HEAL_LOCATION_FALLARBOR_TOWN
 	call FallarborTown_PokemonCenter_1F_EventScript_19FD1B
 	end
 
diff --git a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc
index 6d847d7cc..999541b31 100644
--- a/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/FortreeCity_PokemonCenter_1F/scripts.inc
@@ -3,7 +3,7 @@ FortreeCity_PokemonCenter_1F_MapScripts:: @ 8158011
 	.byte 0
 
 FortreeCity_PokemonCenter_1F_MapScript1_158017:: @ 8158017
-	setrespawn 7
+	setrespawn HEAL_LOCATION_FORTREE_CITY
 	end
 
 FortreeCity_PokemonCenter_1F_EventScript_15801B:: @ 815801B
diff --git a/data/maps/InsideOfTruck/scripts.inc b/data/maps/InsideOfTruck/scripts.inc
index 37fa85041..b2617c8f7 100644
--- a/data/maps/InsideOfTruck/scripts.inc
+++ b/data/maps/InsideOfTruck/scripts.inc
@@ -24,7 +24,7 @@ InsideOfTruck_EventScript_15FC29:: @ 815FC29
 	end
 
 InsideOfTruck_EventScript_15FC45:: @ 815FC45
-	setrespawn 1
+	setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_BRENDANS_HOUSE_2F
 	setvar VAR_LITTLEROOT_INTRO_STATE, 1
 	setflag FLAG_HIDE_MAY_MOM_DOWNSTAIRS
 	setflag FLAG_HIDE_MOVING_TRUCK_MAY
@@ -36,7 +36,7 @@ InsideOfTruck_EventScript_15FC45:: @ 815FC45
 	end
 
 InsideOfTruck_EventScript_15FC68:: @ 815FC68
-	setrespawn 2
+	setrespawn HEAL_LOCATION_LITTLEROOT_TOWN_MAYS_HOUSE_2F
 	setvar VAR_LITTLEROOT_INTRO_STATE, 2
 	setflag FLAG_HIDE_BRENDAN_MOM_DOWNSTAIRS
 	setflag FLAG_HIDE_MOVING_TRUCK_BRENDAN
diff --git a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc
index 4e9c51380..611ced28f 100644
--- a/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/LavaridgeTown_PokemonCenter_1F/scripts.inc
@@ -3,7 +3,7 @@ LavaridgeTown_PokemonCenter_1F_MapScripts:: @ 815390C
 	.byte 0
 
 LavaridgeTown_PokemonCenter_1F_MapScript1_153912:: @ 8153912
-	setrespawn 16
+	setrespawn HEAL_LOCATION_LAVARIDGE_TOWN
 	call LavaridgeTown_PokemonCenter_1F_EventScript_19FD1B
 	end
 
diff --git a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc
index cff88caf0..508f5fab8 100644
--- a/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/LilycoveCity_PokemonCenter_1F/scripts.inc
@@ -3,7 +3,7 @@ LilycoveCity_PokemonCenter_1F_MapScripts:: @ 8159327
 	.byte 0
 
 LilycoveCity_PokemonCenter_1F_MapScript1_15932D:: @ 815932D
-	setrespawn 8
+	setrespawn HEAL_LOCATION_LILYCOVE_CITY
 	end
 
 LilycoveCity_PokemonCenter_1F_EventScript_159331:: @ 8159331
diff --git a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
index 85590f9c2..817679cec 100644
--- a/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/MauvilleCity_PokemonCenter_1F/scripts.inc
@@ -3,7 +3,7 @@ MauvilleCity_PokemonCenter_1F_MapScripts:: @ 8157351
 	.byte 0
 
 MauvilleCity_PokemonCenter_1F_MapScript1_157357:: @ 8157357
-	setrespawn 5
+	setrespawn HEAL_LOCATION_MAUVILLE_CITY
 	call MauvilleCity_PokemonCenter_1F_EventScript_19FD1B
 	goto MauvilleCity_PokemonCenter_1F_EventScript_157365
 	end
diff --git a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc
index a722e666b..906cf8e83 100644
--- a/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/MossdeepCity_PokemonCenter_1F/scripts.inc
@@ -3,7 +3,7 @@ MossdeepCity_PokemonCenter_1F_MapScripts:: @ 815A8D0
 	.byte 0
 
 MossdeepCity_PokemonCenter_1F_MapScript1_15A8D6:: @ 815A8D6
-	setrespawn 9
+	setrespawn HEAL_LOCATION_MOSSDEEP_CITY
 	end
 
 MossdeepCity_PokemonCenter_1F_EventScript_15A8DA:: @ 815A8DA
diff --git a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc
index c993807c6..16e11d6a2 100644
--- a/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/OldaleTown_PokemonCenter_1F/scripts.inc
@@ -3,7 +3,7 @@ OldaleTown_PokemonCenter_1F_MapScripts:: @ 8152F08
 	.byte 0
 
 OldaleTown_PokemonCenter_1F_MapScript1_152F0E:: @ 8152F0E
-	setrespawn 14
+	setrespawn HEAL_LOCATION_OLDALE_TOWN
 	call OldaleTown_PokemonCenter_1F_EventScript_19FD1B
 	end
 
diff --git a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc
index 557b6497e..ea7a8e056 100644
--- a/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/PacifidlogTown_PokemonCenter_1F/scripts.inc
@@ -3,7 +3,7 @@ PacifidlogTown_PokemonCenter_1F_MapScripts:: @ 81540FF
 	.byte 0
 
 PacifidlogTown_PokemonCenter_1F_MapScript1_154105:: @ 8154105
-	setrespawn 19
+	setrespawn HEAL_LOCATION_PACIFIDLOG_TOWN
 	end
 
 @ 8154109
diff --git a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc
index 136cc11c5..6753865e0 100644
--- a/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/PetalburgCity_PokemonCenter_1F/scripts.inc
@@ -3,7 +3,7 @@ PetalburgCity_PokemonCenter_1F_MapScripts:: @ 8155204
 	.byte 0
 
 PetalburgCity_PokemonCenter_1F_MapScript1_15520A:: @ 815520A
-	setrespawn 3
+	setrespawn HEAL_LOCATION_PETALBURG_CITY
 	call PetalburgCity_PokemonCenter_1F_EventScript_19FD1B
 	end
 
diff --git a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc
index 653cceb25..c0bb5c2dd 100644
--- a/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/RustboroCity_PokemonCenter_1F/scripts.inc
@@ -3,7 +3,7 @@ RustboroCity_PokemonCenter_1F_MapScripts:: @ 8157B79
 	.byte 0
 
 RustboroCity_PokemonCenter_1F_MapScript1_157B7F:: @ 8157B7F
-	setrespawn 6
+	setrespawn HEAL_LOCATION_RUSTBORO_CITY
 	call RustboroCity_PokemonCenter_1F_EventScript_19FD1B
 	end
 
diff --git a/data/maps/SSTidalCorridor/scripts.inc b/data/maps/SSTidalCorridor/scripts.inc
index 57872a66a..0f2028476 100644
--- a/data/maps/SSTidalCorridor/scripts.inc
+++ b/data/maps/SSTidalCorridor/scripts.inc
@@ -122,7 +122,7 @@ SSTidalCorridor_EventScript_15FDD6:: @ 815FDD6
 	end
 
 SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8
-	setrespawn 8
+	setrespawn HEAL_LOCATION_LILYCOVE_CITY
 	msgbox SSTidalCorridor_Text_1991F4, 4
 	call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_15FE36
 	warp MAP_LILYCOVE_CITY_HARBOR, 255, 8, 11
@@ -131,7 +131,7 @@ SSTidalCorridor_EventScript_15FDF8:: @ 815FDF8
 	end
 
 SSTidalCorridor_EventScript_15FE17:: @ 815FE17
-	setrespawn 4
+	setrespawn HEAL_LOCATION_SLATEPORT_CITY
 	msgbox SSTidalCorridor_Text_1991F4, 4
 	call_if_set FLAG_RECEIVED_TM49, SSTidalCorridor_EventScript_15FE36
 	warp MAP_SLATEPORT_CITY_HARBOR, 255, 8, 11
diff --git a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc
index 37b2b95ab..1164e96d6 100644
--- a/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/SlateportCity_PokemonCenter_1F/scripts.inc
@@ -3,7 +3,7 @@ SlateportCity_PokemonCenter_1F_MapScripts:: @ 81563BF
 	.byte 0
 
 SlateportCity_PokemonCenter_1F_MapScript1_1563C5:: @ 81563C5
-	setrespawn 4
+	setrespawn HEAL_LOCATION_SLATEPORT_CITY
 	call SlateportCity_PokemonCenter_1F_EventScript_19FD1B
 	end
 
diff --git a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc
index 820dd4858..ebfaf4e23 100644
--- a/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc
+++ b/data/maps/SootopolisCity_PokemonCenter_1F/scripts.inc
@@ -3,7 +3,7 @@ SootopolisCity_PokemonCenter_1F_MapScripts:: @ 815B190
 	.byte 0
 
 SootopolisCity_PokemonCenter_1F_MapScript1_15B196:: @ 815B196
-	setrespawn 10
+	setrespawn HEAL_LOCATION_SOOTOPOLIS_CITY
 	end
 
 @ 815B19A
diff --git a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc
index 956a28ac5..de2f770d6 100644
--- a/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc
+++ b/data/maps/VerdanturfTown_PokemonCenter_1F/scripts.inc
@@ -3,7 +3,7 @@ VerdanturfTown_PokemonCenter_1F_MapScripts:: @ 8153F09
 	.byte 0
 
 VerdanturfTown_PokemonCenter_1F_MapScript1_153F0F:: @ 8153F0F
-	setrespawn 18
+	setrespawn HEAL_LOCATION_VERDANTURF_TOWN
 	call VerdanturfTown_PokemonCenter_1F_EventScript_19FD1B
 	end
 
diff --git a/data/pokenav.s b/data/pokenav.s
index cb0e98472..485568157 100644
--- a/data/pokenav.s
+++ b/data/pokenav.s
@@ -700,7 +700,7 @@ gUnknown_083E4678:: @ 83E4678
 	.incbin "graphics/pokenav/83E4678.gbapal"
 
 	.align 2
-gUnknown_083E4698:: @ 83E4698
+gPokenavRibbonsIconGfx:: @ 83E4698
 	.2byte  0, 0
 	.2byte  1, 0
 	.2byte  2, 0