Fully decomp save.s (#28)

* some work on decomping more save stuff

* code cleanup and decomp another save func

* fully decomp save and combine split save c files

* fix two nonmatchings

2 files changed, 65 insertions, 34 deletions

diff --git a/data/data_80B9BB8.s b/data/data_80B9BB8.s
index 8480f92..7fe5043 100644
--- a/data/data_80B9BB8.s
+++ b/data/data_80B9BB8.s
@@ -528,17 +528,17 @@ gUnknown_80D4120: @ 80D4120
 gUnknown_80D4124: @ 80D4124
 	.incbin "baserom.gba", 0xD4124, 0x20
 
-@ Error Handling
 	.global gUnknown_80D4144
 gUnknown_80D4144: @ 80D4144
-        .byte 0x2e, 0x01
-        .byte 0x2f, 0x01
-        .byte 0x2f, 0x01
-        .byte 0x2d, 0x01
-        .byte 0x30, 0x01
-        .byte 0x32, 0x01
-        .byte 0x33, 0x01
-        .byte 0x00, 0x00
+        .2byte 302
+        .2byte 303
+        .2byte 303
+        .2byte 301
+        .2byte 304
+        .2byte 306
+        .2byte 307
+        .2byte 0
+
         .string "pksdir0\0"
         .string "pksdir0\0"
         .4byte noneText
@@ -558,6 +558,7 @@ gUnknown_80D4144: @ 80D4144
         defaultText:
         .string "default\0"
 
+@ Error Handling
 	.global gFuncFileLineString
 gFuncFileLineString: @ 80D418C
         .string "func = '%s'\n"
@@ -677,40 +678,40 @@ gUnknown_80D42D4: @ 80D42D4
         .string "pksdir0\0"
         .string "pksdir0\0"
 
-	.global gUnknown_80D4354
-gUnknown_80D4354: @ 80D4354
+	.global gSaveCorrupted
+gSaveCorrupted: @ 80D4354
         .string "#+The game data is corrupted.\n"
         .string "#+Your data will be erased.\0"
         .align 2,0
         .string "pksdir0\0"
 
-	.global gUnknown_80D4398
-gUnknown_80D4398: @ 80D4398
+	.global gSavingAdventure
+gSavingAdventure: @ 80D4398
         .string "#+Saving your adventure...\n"
         .string "#+Please don~27t turn off the power.\0"
         .align 2,0
 
-	.global gUnknown_80D43D8
-gUnknown_80D43D8: @ 80D43D8
+	.global gWriteGamePak
+gWriteGamePak: @ 80D43D8
         .string "#+Writing to GBA Game Pak.\n"
         .string "#+Do not remove the GBA Game Pak.\n"
         .string "#+Please wait with the power on.\0"
         .align 2,0
 
-	.global gUnknown_80D4438
-gUnknown_80D4438: @ 80D4438
+	.global gSaveCompleted
+gSaveCompleted: @ 80D4438
         .string "#+Save completed!\0"
         .align 2,0
 
-	.global gUnknown_80D444C
-gUnknown_80D444C: @ 80D444C
+	.global gSaveNotWritten
+gSaveNotWritten: @ 80D444C
         .string "#+The data could not be written.\n"
         .string "#+Please turn off the power and remove\n"
         .string "#+and reinsert the DS Card.\0"
         .align 2,0
 
-	.global gUnknown_80D44B0
-gUnknown_80D44B0: @ 80D44B0
+	.global gSaveFailed
+gSaveFailed: @ 80D44B0
         .string "#+Save failed.\0"
         .align 2,0
         .string "pksdir0\0"
@@ -756,8 +757,8 @@ gUnknown_80D473C: @ 80D473C
         .string "#+and reinsert the DS Card.\0"
         .align 2,0
 
-	.global gUnknown_80D47A0
-gUnknown_80D47A0: @ 80D47A0
+	.global gSaveFailed2
+gSaveFailed2: @ 80D47A0
         .string "#+Save failed.\0"
         .align 2,0
         .string "pksdir0\0"
@@ -2293,6 +2294,9 @@ gUnknown_80DC4BC: @ 80DC4BC
         .byte 0x00, 0x00, 0x00, 0x00
         .byte 0x00, 0x00, 0x00, 0x00
         .byte 0x00, 0x00, 0x00, 0x00
+
+        .global gUnknown_80DC4D4
+gUnknown_80DC4D4: @ 80DC4D4
         .byte 0x01, 0x00, 0x12, 0x00
 
 	.global gUnknown_80DC4D8
@@ -2307,7 +2311,8 @@ gUnknown_80DC4D8: @ 80DC4D8
         .byte 0x11, 0x00
         .byte 0x11, 0x00
         .byte 0x00, 0x00
-        .byte 0xd4, 0xc4, 0x0d, 0x08
+
+        .4byte gUnknown_80DC4D4
 
 	.global gUnknown_80DC4F0
 gUnknown_80DC4F0: @ 80DC4F0
diff --git a/data/data_80F4278.s b/data/data_80F4278.s
index 26a95fe..3805a19 100644
--- a/data/data_80F4278.s
+++ b/data/data_80F4278.s
@@ -8729,25 +8729,46 @@ gAdventureLogText: @ 810B04C
 
 	.global gRescueTeamRanks
 gRescueTeamRanks: @ 810B44C
-        .byte 0xBC, 0xB4, 0x10, 0x08 @ Normal
-        .byte 0xB0, 0xB4, 0x10, 0x08
-        .byte 0xA4, 0xB4, 0x10, 0x08
-        .byte 0x98, 0xB4, 0x10, 0x08
-        .byte 0x88, 0xB4, 0x10, 0x08
-        .byte 0x78, 0xB4, 0x10, 0x08
-        .byte 0x68, 0xB4, 0x10, 0x08 @ Lucario
+        .4byte NormalRank
+        .4byte BronzeRank
+        .4byte SilverRank
+        .4byte GoldRank
+        .4byte PlatinumRank
+        .4byte DiamondRank
+        .4byte LucarioRank
+
+        .global LucarioRank
+        LucarioRank:
         .string "Lucario Rank\0"
         .align 2,0
+
+        .global DiamondRank
+        DiamondRank:
         .string "Diamond Rank\0"
         .align 2,0
+
+        .global PlatinumRank
+        PlatinumRank:
         .string "Platinum Rank\0"
         .align 2,0
+
+        .global GoldRank
+        GoldRank:
         .string "Gold Rank\0"
         .align 2,0
+
+        .global SilverRank
+        SilverRank:
         .string "Silver Rank\0"
         .align 2,0
+
+        .global BronzeRank
+        BronzeRank:
         .string "Bronze Rank\0"
         .align 2,0
+
+        .global NormalRank
+        NormalRank:
         .string "Normal Rank\0"
         .align 2,0
 
@@ -9003,18 +9024,23 @@ gUnknown_8113080: @ 8113080
 	.global gUnknown_811383C
 gUnknown_811383C: @ 811383C
         .byte 0x2C, 0x38, 0x11, 0x08
+
+        .global PlaceText
+        PlaceText:
         .string "#+Place: $m0\0"
         .align 2,0
 
 	.global gUnknown_8113850
 gUnknown_8113850: @ 8113850
-        .byte 0x40, 0x38, 0x11, 0x08
-        .string "$m1 was defeated by\0"
+        .4byte PlaceText
 
+        .global DefeatedbyText
+        DefeatedbyText:
+        .string "$m1 was defeated by\0"
 
 	.global gUnknown_8113868
 gUnknown_8113868: @ 8113868
-        .byte 0x54, 0x38, 0x11, 0x08
+        .4byte DefeatedbyText
         .string "$m1\0"
         .align 2,0