summaryrefslogtreecommitdiff
path: root/common_syms
diff options
context:
space:
mode:
authorMarcus Huderle <huderlem@gmail.com>2020-01-13 20:26:20 -0600
committerMarcus Huderle <huderlem@gmail.com>2020-01-13 20:26:20 -0600
commit5a2d676e71b720e752ca8a624a5795b3b1d7eb6c (patch)
tree6ef755064008dfae8ce2942dc2762670cdabe815 /common_syms
parent5007d279fea5326b41b877703c74fcaa56223364 (diff)
parent22931846d680de2bc585093678db3f5721aab891 (diff)
Merge remote-tracking branch 'upstream' into tustin2121-patch-5
Diffstat (limited to 'common_syms')
-rw-r--r--common_syms/apprentice.txt6
-rw-r--r--common_syms/contest_painting.txt6
-rw-r--r--common_syms/contest_painting_effects.txt10
-rw-r--r--common_syms/field_specials.txt2
-rw-r--r--common_syms/image_processing_effects.txt10
-rw-r--r--common_syms/party_menu.txt2
-rw-r--r--common_syms/save.txt2
-rw-r--r--common_syms/trainer_see.txt6
8 files changed, 22 insertions, 22 deletions
diff --git a/common_syms/apprentice.txt b/common_syms/apprentice.txt
index e35133ecc..0d3569dcb 100644
--- a/common_syms/apprentice.txt
+++ b/common_syms/apprentice.txt
@@ -1,3 +1,3 @@
-gUnknown_030062EC
-gUnknown_030062F0
-gUnknown_030062F4
+gApprenticePartyMovesData
+gApprenticeQuestionData
+gApprenticeFunc
diff --git a/common_syms/contest_painting.txt b/common_syms/contest_painting.txt
index 1fba37a59..32bb8be16 100644
--- a/common_syms/contest_painting.txt
+++ b/common_syms/contest_painting.txt
@@ -1,4 +1,4 @@
-gUnknown_03006190
-gUnknown_030061A0
-gUnknown_030061C0
+gContestMonPixels
+gImageProcessingContext
+gContestPaintingWinner
gContestPaintingMonPalette
diff --git a/common_syms/contest_painting_effects.txt b/common_syms/contest_painting_effects.txt
deleted file mode 100644
index 2f3d79219..000000000
--- a/common_syms/contest_painting_effects.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-gUnknown_03006164
-gUnknown_03006168
-gUnknown_0300616C
-gUnknown_03006170
-gUnknown_03006174
-gUnknown_03006178
-gUnknown_0300617C
-gUnknown_03006180
-gUnknown_03006184
-gUnknown_03006188
diff --git a/common_syms/field_specials.txt b/common_syms/field_specials.txt
index 25d874a65..7adb3f669 100644
--- a/common_syms/field_specials.txt
+++ b/common_syms/field_specials.txt
@@ -1 +1 @@
-gUnknown_030061D0
+gScrollableMultichoice_ListMenuTemplate
diff --git a/common_syms/image_processing_effects.txt b/common_syms/image_processing_effects.txt
new file mode 100644
index 000000000..134f7e88b
--- /dev/null
+++ b/common_syms/image_processing_effects.txt
@@ -0,0 +1,10 @@
+gCanvasColumnStart
+gCanvasPixels
+gCanvasRowEnd
+gCanvasHeight
+gCanvasColumnEnd
+gCanvasRowStart
+gCanvasMonPersonality
+gCanvasWidth
+gCanvasPalette
+gCanvasPaletteStart
diff --git a/common_syms/party_menu.txt b/common_syms/party_menu.txt
index 53e72fa53..6ed37392c 100644
--- a/common_syms/party_menu.txt
+++ b/common_syms/party_menu.txt
@@ -1 +1 @@
-gUnknown_03006328
+gItemUseCB
diff --git a/common_syms/save.txt b/common_syms/save.txt
index d7668c332..190a65840 100644
--- a/common_syms/save.txt
+++ b/common_syms/save.txt
@@ -10,4 +10,4 @@ gSaveFileStatus
gGameContinueCallback
gRamSaveSectionLocations
gSaveUnusedVar2
-gUnknown_03006294
+gSaveAttemptStatus
diff --git a/common_syms/trainer_see.txt b/common_syms/trainer_see.txt
index 2d0514325..0b30a632a 100644
--- a/common_syms/trainer_see.txt
+++ b/common_syms/trainer_see.txt
@@ -1,5 +1,5 @@
-gUnknown_03006080
-gUnknown_03006084
+gWhichTrainerToFaceAfterBattle
+gPostBattleMovementScript
gApproachingTrainers
gNoOfApproachingTrainers
-gUnknown_030060AC
+gTrainerApproachedPlayer