Labeled more symbols (#77)

* Labeled more symbols

* Fixed comment typo

* Renamed some functions

1 files changed, 21 insertions, 21 deletions

diff --git a/src/code_8057824_1.c b/src/code_8057824_1.c
index 4dfc978..b29e46e 100644
--- a/src/code_8057824_1.c
+++ b/src/code_8057824_1.c
@@ -255,7 +255,7 @@ extern void sub_806CE68(struct DungeonEntity *, u32);
 extern void sub_8052D44(u8 *, struct DungeonEntity *, struct DungeonEntity *);
 extern void sub_8097FD0(u32);
 extern void SetMessageArgument(u8 *, struct DungeonEntity *, u32);
-extern struct DungeonEntity *sub_8083600();
+extern struct DungeonEntity *GetLeaderEntity();
 extern void sub_80421C0(struct DungeonEntity *, u32);
 extern void sub_8046D20();
 extern void sub_808B1CC(u8);
@@ -1595,7 +1595,7 @@ void MagmaCavernMidDialogue(void)
   SpriteLookAroundEffect(uVar2);
   PlaySoundEffect(0x1c7);
   sub_80856E0(uVar2,4);
-  // Hey! $m0!
+  // Hey! {ARG_POKEMON_0}!
   // Over there!
   sub_8052910(&gUnknown_8102C30);
   iVar3->entityData->unk15E = 0;
@@ -1622,7 +1622,7 @@ void MagmaCavernMidDialogue(void)
   sub_8052910(&gUnknown_8102CB0);
   sub_803E708(10,0x46);
   // We challenged..
-  // $m2...
+  // {ARG_POKEMON_2}...
   // And wiped out..
   sub_8052910(&gUnknown_8102CF8);
   sub_803E708(10,0x46);
@@ -1637,21 +1637,21 @@ void MagmaCavernMidDialogue(void)
   PlaySoundEffect(0x1d5);
   SpriteLookAroundEffect(uVar2);
   // That's right...
-  // What happened to $m3?
-  // Where is $m3?
+  // What happened to {ARG_POKEMON_3}?
+  // Where is {ARG_POKEMON_3}?
   //
   // Wait...
-  // What about $m3?
-  // Where did $m3 go?
+  // What about {ARG_POKEMON_3}?
+  // Where did {ARG_POKEMON_3} go?
   sub_8052910(&gUnknown_8102D7C);
   sub_803E708(0x1e,0x46);
-  // $m3 is...
-  // Still battling $m2...
+  // {ARG_POKEMON_3} is...
+  // Still battling {ARG_POKEMON_2}...
   sub_8052910(&gUnknown_8102DFC);
   sub_803E708(10,0x46);
   sub_80869E4(uVar2,4,1,2);
   sub_80869E4(uVar1,4,2,6);
-  // $m0!
+  // {ARG_POKEMON_0}!
   // We've got to hurry!
   sub_8052910(&gUnknown_8102E2C);
   sub_8089294();
@@ -3105,7 +3105,7 @@ void sub_808AE54(char param_1,char param_2,u32 *param_3)
     sub_808B1CC(0);
     if (sub_8098100(0x1d) == 0) {
       xxx_init_itemslot_8090A8C(&auStack20,ITEM_ID_ROCK_PART,0);
-      sub_80464C8(sub_8083600(),param_3,&auStack20);
+      sub_80464C8(GetLeaderEntity(),param_3,&auStack20);
       sub_8083E88(0x72);
       // Something fell from Regirock's body
       // Regirock was apparently guarding this item
@@ -3128,7 +3128,7 @@ void sub_808AEC8(char param_1,char param_2,u32 *param_3)
     sub_808B1CC(0);
     if (sub_8098100(0x1d) == 0) {
       xxx_init_itemslot_8090A8C(&auStack20,ITEM_ID_ICE_PART,0);
-      sub_80464C8(sub_8083600(),param_3,&auStack20);
+      sub_80464C8(GetLeaderEntity(),param_3,&auStack20);
       sub_8083E88(0x72);
       // Something fell from Regice's body
       // Regice was apparently guarding this item
@@ -3150,7 +3150,7 @@ void sub_808AF3C(char param_1,char param_2,u32 *param_3)
     sub_808B1CC(0);
     if (sub_8098100(0x1d) == 0) {
       xxx_init_itemslot_8090A8C(&auStack20,ITEM_ID_STEEL_PART,0);
-      sub_80464C8(sub_8083600(),param_3, &auStack20);
+      sub_80464C8(GetLeaderEntity(),param_3, &auStack20);
       sub_8083E88(0x72);
       // Something fell from Registeel's body
       // Registeel was apparently guarding this item
@@ -3168,8 +3168,8 @@ void sub_808AFB0(char param_1)
   sub_8052D44(auStack12,uVar3,0);
   if ((sub_8098100(0x22) == 0) && (param_1 == 0x2E) && (sub_8098100(0x1d) == 0) && (sub_80860A8(ITEM_ID_ROCK_PART) != 0)) {
     sub_8097FD0(0x1d);
-    SetMessageArgument(gAvailablePokemonNames,sub_8083600(),0);
-    // $m0 obatined the Rock Part that Regirock was guarding
+    SetMessageArgument(gAvailablePokemonNames,GetLeaderEntity(),0);
+    // {ARG_POKEMON_0} obtained the Rock Part that Regirock was guarding
     sub_8052910(&gUnknown_81050B4);
     sub_80421C0(0,0xd4);
     sub_803E708(10,70);
@@ -3186,8 +3186,8 @@ void sub_808B030(char param_1)
   sub_8052D44(auStack12,uVar3,0);
   if ((sub_8098100(0x22) == 0) && (param_1 == 0x2F) && (sub_8098100(0x1d) == 0) && (sub_80860A8(ITEM_ID_ICE_PART) != 0)) {
     sub_8097FD0(0x1d);
-    SetMessageArgument(gAvailablePokemonNames,sub_8083600(),0);
-    // $m0 obatined the Ice Part that Regice was guarding
+    SetMessageArgument(gAvailablePokemonNames,GetLeaderEntity(),0);
+    // {ARG_POKEMON_0} obtained the Ice Part that Regice was guarding
     sub_8052910(&gUnknown_810517C);
     sub_80421C0(0,0xd4);
     sub_803E708(10,70);
@@ -3204,8 +3204,8 @@ void sub_808B0B0(char param_1)
   sub_8052D44(auStack12,uVar3,0);
   if ((sub_8098100(0x22) == 0) && (param_1 == 0x30) && (sub_8098100(0x1d) == 0) && (sub_80860A8(ITEM_ID_STEEL_PART) != 0)) {
     sub_8097FD0(0x1d);
-    SetMessageArgument(gAvailablePokemonNames, sub_8083600(), 0);
-    // $m0 obatined the Steel Part that Registeel was guarding
+    SetMessageArgument(gAvailablePokemonNames, GetLeaderEntity(), 0);
+    // {ARG_POKEMON_0} obtained the Steel Part that Registeel was guarding
     sub_8052910(&gUnknown_8105244);
     sub_80421C0(0,0xd4);
     sub_803E708(10,70);
@@ -3284,7 +3284,7 @@ void sub_808B1CC(u8 r0)
 	"\tcmp r2, 0\n"
 	"\tbge _0808B244\n"
 "_0808B208:\n"
-	"\tbl sub_8083600\n"
+	"\tbl GetLeaderEntity\n"
 	"\tadds r2, r0, 0\n"
 	"\tcmp r2, 0\n"
 	"\tbne _0808B230\n"
@@ -3319,7 +3319,7 @@ void sub_808B1CC(u8 r0)
 	"\tldrsh r0, [r0, r2]\n"
 	"\tmovs r3, 0x2\n"
 	"\tldrsh r1, [r5, r3]\n"
-	"\tbl sub_8049590\n"
+	"\tbl GetMapEntity\n"
 	"\tldrh r2, [r0]\n"
 	"\tmovs r3, 0x80\n"
 	"\tlsls r3, 2\n"