Define landmark constants

3 files changed, 58 insertions, 58 deletions

diff --git a/data/maps/landmarks.asm b/data/maps/landmarks.asm
index 314e4ba..bc05bd3 100644
--- a/data/maps/landmarks.asm
+++ b/data/maps/landmarks.asm
@@ -3,48 +3,48 @@ INCLUDE "constants.asm"
 SECTION "LandmarkNames", ROMX[$4AAF], BANK[$3F]
 
 LandmarkNames::
-	db "サイレント@"
-	db "オールド@"
-	db "ウエスト@"
-	db "ハイテク@"
-	db "フォント@"
-	db "バードン@"
-	db "ニュータイプ@"
-	db "シュガー@"
-	db "ブルーフォレスト@"
-	db "スタンド@"
-	db "カントー@"
-	db "プりンス@"
-	db "フジヤマ@"
-	db "サウス@"
-	db "ノース@"
-	db "１５ばんどうろ@"
-	db "１８ばんどうろ@"
-	db "はつでんしょ１@"
-	db "はつでんしょ２@"
-	db "はつでんしょ３@"
-	db "はつでんしょ４@"
-	db "いせき　１@"
-	db "いせき　２@"
-	db "はいこう１@"
-	db "はいこう２@"
-	db "はいこう３@"
-	db "はいこう４@"
-	db "はいこう５@"
-	db "はいこう６@"
-	db "はいこう７@"
-	db "アジト　１@"
-	db "アジト　２@"
-	db "アジト　３@"
-	db "ヤドンの　いど１@"
-	db "ヤドンの　いど２@"
-	db "#りーぐ１@"
-	db "#りーぐ１@"
-	db "#りーぐ２@"
-	db "#りーぐ３@"
-	db "#りーぐ４@"
-	db "#りーぐ５@"
-	db "#りーぐ６@"
-	db "#りーぐ７@"
-	db "#りーぐ７@"
-	db "しずかなおか@"
+	db "サイレント@" ; SILENT
+	db "オールド@" ; OLD
+	db "ウエスト@" ; WEST
+	db "ハイテク@" ; HIGH_TECH
+	db "フォント@" ; FOUNT
+	db "バードン@" ; BIRDON
+	db "ニュータイプ@" ; NEW_TYPE
+	db "シュガー@" ; SUGAR
+	db "ブルーフォレスト@" ; BLUE_FOREST
+	db "スタンド@" ; STAND
+	db "カントー@" ; KANTO
+	db "プりンス@" ; PRINCE
+	db "フジヤマ@" ; MT_FUJI
+	db "サウス@" ; SOUTH
+	db "ノース@" ; NORTH
+	db "１５ばんどうろ@" ; ROUTE_15
+	db "１８ばんどうろ@" ; ROUTE_18
+	db "はつでんしょ１@" ; POWER_PLANT_1
+	db "はつでんしょ２@" ; POWER_PLANT_2
+	db "はつでんしょ３@" ; POWER_PLANT_3
+	db "はつでんしょ４@" ; POWER_PLANT_4
+	db "いせき　１@" ; RUINS_1
+	db "いせき　２@" ; RUINS_2
+	db "はいこう１@" ; MINES_1
+	db "はいこう２@" ; MINES_2
+	db "はいこう３@" ; MINES_3
+	db "はいこう４@" ; MINES_4
+	db "はいこう５@" ; MINES_5
+	db "はいこう６@" ; MINES_6
+	db "はいこう７@" ; MINES_7
+	db "アジト　１@" ; HIDEOUT_1
+	db "アジト　２@" ; HIDEOUT_2
+	db "アジト　３@" ; HIDEOUT_3
+	db "ヤドンの　いど１@" ; SLOWPOKE_WELL_1
+	db "ヤドンの　いど２@" ; SLOWPOKE_WELL_2
+	db "#りーぐ１@" ; POKEMON_LEAGUE_1
+	db "#りーぐ１@" ; POKEMON_LEAGUE_1_2
+	db "#りーぐ２@" ; POKEMON_LEAGUE_2
+	db "#りーぐ３@" ; POKEMON_LEAGUE_3
+	db "#りーぐ４@" ; POKEMON_LEAGUE_4
+	db "#りーぐ５@" ; POKEMON_LEAGUE_5
+	db "#りーぐ６@" ; POKEMON_LEAGUE_6
+	db "#りーぐ７@" ; POKEMON_LEAGUE_7
+	db "#りーぐ７@" ; POKEMON_LEAGUE_7_2
+	db "しずかなおか@" ; SILENT_HILL
diff --git a/data/pokemon/palettes.inc b/data/pokemon/palettes.inc
index 41ca0d5..a38cd99 100755
--- a/data/pokemon/palettes.inc
+++ b/data/pokemon/palettes.inc
@@ -251,7 +251,7 @@ PokemonPalettes:
 	db PAL_BROWNMON  ; BULU
 	db PAL_BROWNMON  ; TAIL
 	db PAL_GREENMON  ; LEAFY
-	db PAL_MEWMON    ; NONE
-	db PAL_MEWMON    ; NONE
-	db PAL_MEWMON    ; NONE
-	db PAL_MEWMON    ; NONE
+	db PAL_MEWMON    ; FC
+	db PAL_MEWMON    ; FD
+	db PAL_MEWMON    ; FE
+	db PAL_MEWMON    ; FF
diff --git a/data/wild.asm b/data/wild.asm
index 515985d..d1cea5c 100644
--- a/data/wild.asm
+++ b/data/wild.asm
@@ -7,7 +7,7 @@ GrassWildMons:: ; f:6a3c
 	db $01, $01 ; map group, map id
 	db 8 percent, 8 percent, 8 percent ; encounter rates: morn/day/nite
 	; morn
-if def(GOLD)
+if DEF(GOLD)
 	db 7, DEX_SUNNY
 	db 3, DEX_SUNNY
 	db 5, DEX_SUNNY
@@ -23,7 +23,7 @@ endc
 	db 4, DEX_KORATTA
 	db 6, DEX_KIRINRIKI
 	db 4, DEX_KIRINRIKI
-if def(GOLD)
+if DEF(GOLD)
 	db 4, DEX_HANEKO
 else
 	db 4, DEX_MARIL
@@ -34,7 +34,7 @@ endc
 	db 7, DEX_KORATTA
 	db 5, DEX_KORATTA
 	db 5, DEX_KORATTA
-if def(GOLD)
+if DEF(GOLD)
 	db 7, DEX_KORATTA
 	db 8, DEX_KORATTA
 else
@@ -46,7 +46,7 @@ endc
 	db $01, $02 ; map group, map id
 	db 8 percent, 8 percent, 8 percent ; encounter rates: morn/day/nite
 	; morn
-if def(GOLD)
+if DEF(GOLD)
 	db 6, DEX_SUNNY
 	db 6, DEX_SUNNY
 	db 6, DEX_SUNNY
@@ -62,7 +62,7 @@ endc
 	db 5, DEX_POPPO
 	db 7, DEX_YOROIDORI
 	db 5, DEX_KORATTA
-if def(GOLD)
+if DEF(GOLD)
 	db 8, DEX_HANEKO
 else
 	db 8, DEX_MARIL
@@ -72,7 +72,7 @@ endc
 	; nite
 	db 7, DEX_KORATTA
 	db 6, DEX_ARBO
-if def(GOLD)
+if DEF(GOLD)
 	db 6, DEX_KORATTA
 else
 	db 6, DEX_HOHO
@@ -622,7 +622,7 @@ endc
 	db 6, DEX_POPPO
 	db 4, DEX_CATERPIE
 	db 6, DEX_CATERPIE
-if def(GOLD)
+if DEF(GOLD)
 	db 6, DEX_HANEKO
 else
 	db 6, DEX_MARIL
@@ -632,7 +632,7 @@ endc
 	; nite
 	db 4, DEX_TRANSEL
 	db 6, DEX_KORATTA
-if def(GOLD)
+if DEF(GOLD)
 	db 6, DEX_CATERPIE
 else
 	db 5, DEX_HOHO
@@ -641,5 +641,5 @@ endc
 	db 5, DEX_TRANSEL
 	db 5, DEX_PIKACHU
 
-	db $FF
+	db -1 ; end
 ; f:6e3e