1 files changed, 14 insertions, 14 deletions
diff --git a/src/battle_4.c b/src/battle_4.c
index d8141bad1..65ea765cf 100644
--- a/src/battle_4.c
+++ b/src/battle_4.c
@@ -144,7 +144,7 @@ void sub_802BBD4(u8 r0, u8 r1, u8 r2, u8 r3, u8 sp0);
 void nullsub_6(void);
 void ReshowBattleScreenAfterMenu(void);
 void sub_800F808(void);
-void sub_80B79B8(u32* moneySaveblock, u32 to_give);
+void AddMoney(u32* moneySaveblock, u32 to_give);
 void sub_80156DC(void); //set sentpokes value
 bool8 sub_8014AB8(u8 bank); //can run from battle
 u8 CountAliveMons(u8 caseID);
@@ -154,7 +154,7 @@ u8 GetMoveTarget(u16 move, u8 targetbyte); //get target of move
 void sub_80153D0(u8 atk); //pressure perish song pp decrement
 u8 CastformDataTypeChange(u8 bank);
 void b_push_move_exec(u8* bs_ptr);
-u8 sav1_map_get_light_level(void);
+u8 Overworld_GetMapTypeOfSaveblockLocation(void);
 u8 CalculatePlayerPartyCount(void);
 u16 Sqrt(u32 num);
 u8 sub_809070C(u16 nationalNum, u32 TiD, u32 PiD); //task prepare poke dex display
@@ -11717,7 +11717,7 @@ static void atk5D_getmoneyreward(void)
             money_to_give = 1 * gTrainerMoney[i * 4 + 1] * money_to_give;
     }
 
-    sub_80B79B8(&gSaveBlock1.money, money_to_give);
+    AddMoney(&gSaveBlock1.money, money_to_give);
     gBattleTextBuff1[0] = 0xFD;
     gBattleTextBuff1[1] = 1;
     gBattleTextBuff1[2] = 4;
@@ -11889,7 +11889,7 @@ _0802413C:\n\
 _08024140:\n\
     mov r0, r8\n\
     adds r1, r4, 0\n\
-    bl sub_80B79B8\n\
+    bl AddMoney\n\
     ldr r1, _0802418C @ =gBattleTextBuff1\n\
     movs r0, 0xFD\n\
     strb r0, [r1]\n\
@@ -14186,7 +14186,7 @@ static void atk91_givepaydaymoney(void)
 {
     if (!(gBattleTypeFlags & BATTLE_TYPE_LINK) && gPaydayMoney)
     {
-        sub_80B79B8(&gSaveBlock1.money, gPaydayMoney * BATTLE_STRUCT->moneyMultiplier);
+        AddMoney(&gSaveBlock1.money, gPaydayMoney * BATTLE_STRUCT->moneyMultiplier);
         gBattleTextBuff1[0] = 0xFD;
         gBattleTextBuff1[1] = 1;
         gBattleTextBuff1[2] = 2;
@@ -17570,28 +17570,28 @@ static void atkE4_getsecretpowereffect(void)
 {
     switch (gBattleTerrain)
     {
-    case 0:
+    case BATTLE_TERRAIN_GRASS:
         gBattleCommunication[MOVE_EFFECT_BYTE] = 2;
         break;
-    case 1:
+    case BATTLE_TERRAIN_LONG_GRASS:
         gBattleCommunication[MOVE_EFFECT_BYTE] = 1;
         break;
-    case 2:
+    case BATTLE_TERRAIN_SAND:
         gBattleCommunication[MOVE_EFFECT_BYTE] = 27;
         break;
-    case 3:
+    case BATTLE_TERRAIN_UNDERWATER:
         gBattleCommunication[MOVE_EFFECT_BYTE] = 23;
         break;
-    case 4:
+    case BATTLE_TERRAIN_WATER:
         gBattleCommunication[MOVE_EFFECT_BYTE] = 22;
         break;
-    case 5:
+    case BATTLE_TERRAIN_POND:
         gBattleCommunication[MOVE_EFFECT_BYTE] = 24;
         break;
-    case 6:
+    case BATTLE_TERRAIN_MOUNTAIN:
         gBattleCommunication[MOVE_EFFECT_BYTE] = 7;
         break;
-    case 7:
+    case BATTLE_TERRAIN_CAVE:
         gBattleCommunication[MOVE_EFFECT_BYTE] = 8;
         break;
     default:
@@ -17818,7 +17818,7 @@ void atkEF_pokeball_catch_calculation(void)
                     ball_multiplier = 10;
                 break;
             case ITEM_DIVE_BALL:
-                if (sav1_map_get_light_level() == 5)
+                if (Overworld_GetMapTypeOfSaveblockLocation() == 5)
                     ball_multiplier = 35;
                 else
                     ball_multiplier = 10;