Merge branch 'master' of https://github.com/pret/pokered

5 files changed, 217 insertions, 212 deletions

diff --git a/data/events/trades.asm b/data/events/trades.asm
index 1da0036c..0341a87f 100644
--- a/data/events/trades.asm
+++ b/data/events/trades.asm
@@ -1,7 +1,12 @@
+MACRO npctrade
+; give mon, get mon, dialog id, nickname
+	db \1, \2, \3
+	dname \4, NAME_LENGTH
+ENDM
+
 TradeMons:
 ; entries correspond to TRADE_FOR_* constants
 	table_width 3 + NAME_LENGTH
-	; give mon, get mon, dialog id, nickname
 	; The two instances of TRADE_DIALOGSET_EVOLUTION are a leftover
 	; from the Japanese Blue trades, which used species that evolve.
 	; TRADE_DIALOGSET_EVOLUTION did not refer to evolution in Japanese
@@ -9,14 +14,14 @@ TradeMons:
 	; "went and evolved" and also changed the trades to match. English
 	; Red/Blue uses the original JP Red/Green trades but with the JP Blue
 	; post-trade text.
-	db LICKITUNG,  DUGTRIO,  TRADE_DIALOGSET_CASUAL,    "GURIO@@@@@@"
-	db CLEFAIRY,   MR_MIME,  TRADE_DIALOGSET_CASUAL,    "MILES@@@@@@"
-	db BUTTERFREE, BEEDRILL, TRADE_DIALOGSET_HAPPY,     "STINGER@@@@" ; unused
-	db KANGASKHAN, MUK,      TRADE_DIALOGSET_CASUAL,    "STICKY@@@@@"
-	db MEW,        MEW,      TRADE_DIALOGSET_HAPPY,     "BART@@@@@@@" ; unused
-	db TANGELA,    PARASECT, TRADE_DIALOGSET_CASUAL,    "SPIKE@@@@@@"
-	db PIDGEOT,    PIDGEOT,  TRADE_DIALOGSET_EVOLUTION, "MARTY@@@@@@" ; unused
-	db GOLDUCK,    RHYDON,   TRADE_DIALOGSET_EVOLUTION, "BUFFY@@@@@@"
-	db GROWLITHE,  DEWGONG,  TRADE_DIALOGSET_HAPPY,     "CEZANNE@@@@"
-	db CUBONE,     MACHOKE,  TRADE_DIALOGSET_HAPPY,     "RICKY@@@@@@"
+	npctrade LICKITUNG,  DUGTRIO,  TRADE_DIALOGSET_CASUAL,    "GURIO"
+	npctrade CLEFAIRY,   MR_MIME,  TRADE_DIALOGSET_CASUAL,    "MILES"
+	npctrade BUTTERFREE, BEEDRILL, TRADE_DIALOGSET_HAPPY,     "STINGER" ; unused
+	npctrade KANGASKHAN, MUK,      TRADE_DIALOGSET_CASUAL,    "STICKY"
+	npctrade MEW,        MEW,      TRADE_DIALOGSET_HAPPY,     "BART"    ; unused
+	npctrade TANGELA,    PARASECT, TRADE_DIALOGSET_CASUAL,    "SPIKE"
+	npctrade PIDGEOT,    PIDGEOT,  TRADE_DIALOGSET_EVOLUTION, "MARTY"   ; unused
+	npctrade GOLDUCK,    RHYDON,   TRADE_DIALOGSET_EVOLUTION, "BUFFY"
+	npctrade GROWLITHE,  DEWGONG,  TRADE_DIALOGSET_HAPPY,     "CEZANNE"
+	npctrade CUBONE,     MACHOKE,  TRADE_DIALOGSET_HAPPY,     "RICKY"
 	assert_table_length NUM_NPC_TRADES
diff --git a/data/maps/hide_show_data.asm b/data/maps/hide_show_data.asm
index 72e3add9..de9eb979 100644
--- a/data/maps/hide_show_data.asm
+++ b/data/maps/hide_show_data.asm
@@ -256,7 +256,7 @@ MapHSPointers:
 	dw -1 ; end
 
 NoHS:
-	db $FF, $FF, $FF
+	db -1, -1, -1 ; end
 
 MissableObjects:
 ; entries correspond to HS_* constants (see constants/hide_show_constants)
@@ -578,5 +578,5 @@ BluesHouseHSCopy: ; unreferenced
 	db BLUES_HOUSE, BLUESHOUSE_DAISY1,   SHOW
 	db BLUES_HOUSE, BLUESHOUSE_DAISY2,   HIDE
 	db BLUES_HOUSE, BLUESHOUSE_TOWN_MAP, SHOW
-	db $FF, $01, SHOW ; end
-	assert_table_length NUM_HS_OBJECTS + 1
+	assert_table_length NUM_HS_OBJECTS
+	db -1, 1, SHOW ; end
diff --git a/data/maps/objects/Route2Gate.asm b/data/maps/objects/Route2Gate.asm
index 6c46736d..44e4aa67 100644
--- a/data/maps/objects/Route2Gate.asm
+++ b/data/maps/objects/Route2Gate.asm
@@ -1,6 +1,6 @@
 	object_const_def
-	const_export ROUTE2_OAKS_AIDE
-	const_export ROUTE2_YOUNGSTER
+	const_export ROUTE2GATE_OAKS_AIDE
+	const_export ROUTE2GATE_YOUNGSTER
 
 Route2Gate_Object:
 	db $a ; border block
diff --git a/data/pokemon/names.asm b/data/pokemon/names.asm
index 5d447c92..8e8d1120 100644
--- a/data/pokemon/names.asm
+++ b/data/pokemon/names.asm
@@ -1,193 +1,193 @@
 MonsterNames::
 	table_width NAME_LENGTH - 1
-	db "RHYDON@@@@"
-	db "KANGASKHAN"
-	db "NIDORAN♂@@"
-	db "CLEFAIRY@@"
-	db "SPEAROW@@@"
-	db "VOLTORB@@@"
-	db "NIDOKING@@"
-	db "SLOWBRO@@@"
-	db "IVYSAUR@@@"
-	db "EXEGGUTOR@"
-	db "LICKITUNG@"
-	db "EXEGGCUTE@"
-	db "GRIMER@@@@"
-	db "GENGAR@@@@"
-	db "NIDORAN♀@@"
-	db "NIDOQUEEN@"
-	db "CUBONE@@@@"
-	db "RHYHORN@@@"
-	db "LAPRAS@@@@"
-	db "ARCANINE@@"
-	db "MEW@@@@@@@"
-	db "GYARADOS@@"
-	db "SHELLDER@@"
-	db "TENTACOOL@"
-	db "GASTLY@@@@"
-	db "SCYTHER@@@"
-	db "STARYU@@@@"
-	db "BLASTOISE@"
-	db "PINSIR@@@@"
-	db "TANGELA@@@"
-	db "MISSINGNO."
-	db "MISSINGNO."
-	db "GROWLITHE@"
-	db "ONIX@@@@@@"
-	db "FEAROW@@@@"
-	db "PIDGEY@@@@"
-	db "SLOWPOKE@@"
-	db "KADABRA@@@"
-	db "GRAVELER@@"
-	db "CHANSEY@@@"
-	db "MACHOKE@@@"
-	db "MR.MIME@@@"
-	db "HITMONLEE@"
-	db "HITMONCHAN"
-	db "ARBOK@@@@@"
-	db "PARASECT@@"
-	db "PSYDUCK@@@"
-	db "DROWZEE@@@"
-	db "GOLEM@@@@@"
-	db "MISSINGNO."
-	db "MAGMAR@@@@"
-	db "MISSINGNO."
-	db "ELECTABUZZ"
-	db "MAGNETON@@"
-	db "KOFFING@@@"
-	db "MISSINGNO."
-	db "MANKEY@@@@"
-	db "SEEL@@@@@@"
-	db "DIGLETT@@@"
-	db "TAUROS@@@@"
-	db "MISSINGNO."
-	db "MISSINGNO."
-	db "MISSINGNO."
-	db "FARFETCH'D"
-	db "VENONAT@@@"
-	db "DRAGONITE@"
-	db "MISSINGNO."
-	db "MISSINGNO."
-	db "MISSINGNO."
-	db "DODUO@@@@@"
-	db "POLIWAG@@@"
-	db "JYNX@@@@@@"
-	db "MOLTRES@@@"
-	db "ARTICUNO@@"
-	db "ZAPDOS@@@@"
-	db "DITTO@@@@@"
-	db "MEOWTH@@@@"
-	db "KRABBY@@@@"
-	db "MISSINGNO."
-	db "MISSINGNO."
-	db "MISSINGNO."
-	db "VULPIX@@@@"
-	db "NINETALES@"
-	db "PIKACHU@@@"
-	db "RAICHU@@@@"
-	db "MISSINGNO."
-	db "MISSINGNO."
-	db "DRATINI@@@"
-	db "DRAGONAIR@"
-	db "KABUTO@@@@"
-	db "KABUTOPS@@"
-	db "HORSEA@@@@"
-	db "SEADRA@@@@"
-	db "MISSINGNO."
-	db "MISSINGNO."
-	db "SANDSHREW@"
-	db "SANDSLASH@"
-	db "OMANYTE@@@"
-	db "OMASTAR@@@"
-	db "JIGGLYPUFF"
-	db "WIGGLYTUFF"
-	db "EEVEE@@@@@"
-	db "FLAREON@@@"
-	db "JOLTEON@@@"
-	db "VAPOREON@@"
-	db "MACHOP@@@@"
-	db "ZUBAT@@@@@"
-	db "EKANS@@@@@"
-	db "PARAS@@@@@"
-	db "POLIWHIRL@"
-	db "POLIWRATH@"
-	db "WEEDLE@@@@"
-	db "KAKUNA@@@@"
-	db "BEEDRILL@@"
-	db "MISSINGNO."
-	db "DODRIO@@@@"
-	db "PRIMEAPE@@"
-	db "DUGTRIO@@@"
-	db "VENOMOTH@@"
-	db "DEWGONG@@@"
-	db "MISSINGNO."
-	db "MISSINGNO."
-	db "CATERPIE@@"
-	db "METAPOD@@@"
-	db "BUTTERFREE"
-	db "MACHAMP@@@"
-	db "MISSINGNO."
-	db "GOLDUCK@@@"
-	db "HYPNO@@@@@"
-	db "GOLBAT@@@@"
-	db "MEWTWO@@@@"
-	db "SNORLAX@@@"
-	db "MAGIKARP@@"
-	db "MISSINGNO."
-	db "MISSINGNO."
-	db "MUK@@@@@@@"
-	db "MISSINGNO."
-	db "KINGLER@@@"
-	db "CLOYSTER@@"
-	db "MISSINGNO."
-	db "ELECTRODE@"
-	db "CLEFABLE@@"
-	db "WEEZING@@@"
-	db "PERSIAN@@@"
-	db "MAROWAK@@@"
-	db "MISSINGNO."
-	db "HAUNTER@@@"
-	db "ABRA@@@@@@"
-	db "ALAKAZAM@@"
-	db "PIDGEOTTO@"
-	db "PIDGEOT@@@"
-	db "STARMIE@@@"
-	db "BULBASAUR@"
-	db "VENUSAUR@@"
-	db "TENTACRUEL"
-	db "MISSINGNO."
-	db "GOLDEEN@@@"
-	db "SEAKING@@@"
-	db "MISSINGNO."
-	db "MISSINGNO."
-	db "MISSINGNO."
-	db "MISSINGNO."
-	db "PONYTA@@@@"
-	db "RAPIDASH@@"
-	db "RATTATA@@@"
-	db "RATICATE@@"
-	db "NIDORINO@@"
-	db "NIDORINA@@"
-	db "GEODUDE@@@"
-	db "PORYGON@@@"
-	db "AERODACTYL"
-	db "MISSINGNO."
-	db "MAGNEMITE@"
-	db "MISSINGNO."
-	db "MISSINGNO."
-	db "CHARMANDER"
-	db "SQUIRTLE@@"
-	db "CHARMELEON"
-	db "WARTORTLE@"
-	db "CHARIZARD@"
-	db "MISSINGNO."
-	db "MISSINGNO."
-	db "MISSINGNO."
-	db "MISSINGNO."
-	db "ODDISH@@@@"
-	db "GLOOM@@@@@"
-	db "VILEPLUME@"
-	db "BELLSPROUT"
-	db "WEEPINBELL"
-	db "VICTREEBEL"
+	dname "RHYDON"
+	dname "KANGASKHAN"
+	dname "NIDORAN♂"
+	dname "CLEFAIRY"
+	dname "SPEAROW"
+	dname "VOLTORB"
+	dname "NIDOKING"
+	dname "SLOWBRO"
+	dname "IVYSAUR"
+	dname "EXEGGUTOR"
+	dname "LICKITUNG"
+	dname "EXEGGCUTE"
+	dname "GRIMER"
+	dname "GENGAR"
+	dname "NIDORAN♀"
+	dname "NIDOQUEEN"
+	dname "CUBONE"
+	dname "RHYHORN"
+	dname "LAPRAS"
+	dname "ARCANINE"
+	dname "MEW"
+	dname "GYARADOS"
+	dname "SHELLDER"
+	dname "TENTACOOL"
+	dname "GASTLY"
+	dname "SCYTHER"
+	dname "STARYU"
+	dname "BLASTOISE"
+	dname "PINSIR"
+	dname "TANGELA"
+	dname "MISSINGNO."
+	dname "MISSINGNO."
+	dname "GROWLITHE"
+	dname "ONIX"
+	dname "FEAROW"
+	dname "PIDGEY"
+	dname "SLOWPOKE"
+	dname "KADABRA"
+	dname "GRAVELER"
+	dname "CHANSEY"
+	dname "MACHOKE"
+	dname "MR.MIME"
+	dname "HITMONLEE"
+	dname "HITMONCHAN"
+	dname "ARBOK"
+	dname "PARASECT"
+	dname "PSYDUCK"
+	dname "DROWZEE"
+	dname "GOLEM"
+	dname "MISSINGNO."
+	dname "MAGMAR"
+	dname "MISSINGNO."
+	dname "ELECTABUZZ"
+	dname "MAGNETON"
+	dname "KOFFING"
+	dname "MISSINGNO."
+	dname "MANKEY"
+	dname "SEEL"
+	dname "DIGLETT"
+	dname "TAUROS"
+	dname "MISSINGNO."
+	dname "MISSINGNO."
+	dname "MISSINGNO."
+	dname "FARFETCH'D"
+	dname "VENONAT"
+	dname "DRAGONITE"
+	dname "MISSINGNO."
+	dname "MISSINGNO."
+	dname "MISSINGNO."
+	dname "DODUO"
+	dname "POLIWAG"
+	dname "JYNX"
+	dname "MOLTRES"
+	dname "ARTICUNO"
+	dname "ZAPDOS"
+	dname "DITTO"
+	dname "MEOWTH"
+	dname "KRABBY"
+	dname "MISSINGNO."
+	dname "MISSINGNO."
+	dname "MISSINGNO."
+	dname "VULPIX"
+	dname "NINETALES"
+	dname "PIKACHU"
+	dname "RAICHU"
+	dname "MISSINGNO."
+	dname "MISSINGNO."
+	dname "DRATINI"
+	dname "DRAGONAIR"
+	dname "KABUTO"
+	dname "KABUTOPS"
+	dname "HORSEA"
+	dname "SEADRA"
+	dname "MISSINGNO."
+	dname "MISSINGNO."
+	dname "SANDSHREW"
+	dname "SANDSLASH"
+	dname "OMANYTE"
+	dname "OMASTAR"
+	dname "JIGGLYPUFF"
+	dname "WIGGLYTUFF"
+	dname "EEVEE"
+	dname "FLAREON"
+	dname "JOLTEON"
+	dname "VAPOREON"
+	dname "MACHOP"
+	dname "ZUBAT"
+	dname "EKANS"
+	dname "PARAS"
+	dname "POLIWHIRL"
+	dname "POLIWRATH"
+	dname "WEEDLE"
+	dname "KAKUNA"
+	dname "BEEDRILL"
+	dname "MISSINGNO."
+	dname "DODRIO"
+	dname "PRIMEAPE"
+	dname "DUGTRIO"
+	dname "VENOMOTH"
+	dname "DEWGONG"
+	dname "MISSINGNO."
+	dname "MISSINGNO."
+	dname "CATERPIE"
+	dname "METAPOD"
+	dname "BUTTERFREE"
+	dname "MACHAMP"
+	dname "MISSINGNO."
+	dname "GOLDUCK"
+	dname "HYPNO"
+	dname "GOLBAT"
+	dname "MEWTWO"
+	dname "SNORLAX"
+	dname "MAGIKARP"
+	dname "MISSINGNO."
+	dname "MISSINGNO."
+	dname "MUK"
+	dname "MISSINGNO."
+	dname "KINGLER"
+	dname "CLOYSTER"
+	dname "MISSINGNO."
+	dname "ELECTRODE"
+	dname "CLEFABLE"
+	dname "WEEZING"
+	dname "PERSIAN"
+	dname "MAROWAK"
+	dname "MISSINGNO."
+	dname "HAUNTER"
+	dname "ABRA"
+	dname "ALAKAZAM"
+	dname "PIDGEOTTO"
+	dname "PIDGEOT"
+	dname "STARMIE"
+	dname "BULBASAUR"
+	dname "VENUSAUR"
+	dname "TENTACRUEL"
+	dname "MISSINGNO."
+	dname "GOLDEEN"
+	dname "SEAKING"
+	dname "MISSINGNO."
+	dname "MISSINGNO."
+	dname "MISSINGNO."
+	dname "MISSINGNO."
+	dname "PONYTA"
+	dname "RAPIDASH"
+	dname "RATTATA"
+	dname "RATICATE"
+	dname "NIDORINO"
+	dname "NIDORINA"
+	dname "GEODUDE"
+	dname "PORYGON"
+	dname "AERODACTYL"
+	dname "MISSINGNO."
+	dname "MAGNEMITE"
+	dname "MISSINGNO."
+	dname "MISSINGNO."
+	dname "CHARMANDER"
+	dname "SQUIRTLE"
+	dname "CHARMELEON"
+	dname "WARTORTLE"
+	dname "CHARIZARD"
+	dname "MISSINGNO."
+	dname "MISSINGNO."
+	dname "MISSINGNO."
+	dname "MISSINGNO."
+	dname "ODDISH"
+	dname "GLOOM"
+	dname "VILEPLUME"
+	dname "BELLSPROUT"
+	dname "WEEPINBELL"
+	dname "VICTREEBEL"
 	assert_table_length NUM_POKEMON_INDEXES
diff --git a/data/predef_pointers.asm b/data/predef_pointers.asm
index ebf81847..e6968c46 100644
--- a/data/predef_pointers.asm
+++ b/data/predef_pointers.asm
@@ -53,7 +53,7 @@ PredefPointers::
 	add_predef DoubleOrHalveSelectedStats
 	add_predef ShowPokedexMenu
 	add_predef EvolutionAfterBattle
-	add_predef SaveSAVtoSRAM0
+	add_predef SaveMainData
 	add_predef InitOpponent
 	add_predef CableClub_Run
 	add_predef DrawBadges
@@ -73,7 +73,7 @@ PredefPointers::
 	add_predef UsedCut
 	add_predef ShowPokedexData
 	add_predef WriteMonMoves
-	add_predef SaveSAV
+	add_predef SaveMenu
 	add_predef LoadSGB
 	add_predef MarkTownVisitedAndLoadMissableObjects
 	add_predef SetPartyMonTypes
@@ -90,10 +90,10 @@ PredefPointers::
 	add_predef EmptyFunc ; return immediately
 	add_predef AskName
 	add_predef PewterGuys
-	add_predef SaveSAVtoSRAM2
-	add_predef LoadSAV2
-	add_predef LoadSAV
-	add_predef SaveSAVtoSRAM1
+	add_predef SavePartyAndDexData
+	add_predef LoadPartyAndDexData
+	add_predef TryLoadSaveFile
+	add_predef SaveCurrentBoxData
 	add_predef DoInGameTradeDialogue
 	add_predef HallOfFamePC
 	add_predef DisplayDexRating