aboutsummaryrefslogtreecommitdiffstats
path: root/data
diff options
context:
space:
mode:
Diffstat (limited to 'data')
-rw-r--r--data/maps/objects/Route2Gate.asm4
-rw-r--r--data/predef_pointers.asm12
2 files changed, 8 insertions, 8 deletions
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/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