From c22e26808314a4c7a631a9a35b2b69d6d0b0e150 Mon Sep 17 00:00:00 2001
From: mid-kid <esteve.varela@gmail.com>
Date: Wed, 19 Feb 2020 19:08:40 +0100
Subject: [PATCH] RTC -> UpdateTimeAndPals

Rename clear misnomer.
Most of the related functions in that file aren't really aptly named but
I don't know good names right now.
---
 engine/events/field_moves.asm | 2 +-
 engine/link/link_trade.asm    | 2 +-
 engine/menus/menu.asm         | 2 +-
 home/joypad.asm               | 4 ++--
 home/names.asm                | 2 +-
 home/rtc.asm                  | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/engine/events/field_moves.asm b/engine/events/field_moves.asm
index 1fd4f4fe0..c898c6690 100644
--- a/engine/events/field_moves.asm
+++ b/engine/events/field_moves.asm
@@ -92,7 +92,7 @@ HideHeadbuttTree:
 	ld h, [hl]
 	ld l, a
 
-	ld a, $5
+	ld a, $05 ; grass block
 	ld [hli], a
 	ld [hld], a
 	ld bc, SCREEN_WIDTH
diff --git a/engine/link/link_trade.asm b/engine/link/link_trade.asm
index 16dc02e8c..4119e48a7 100644
--- a/engine/link/link_trade.asm
+++ b/engine/link/link_trade.asm
@@ -240,7 +240,7 @@ LinkTradeMenu:
 	ret
 
 .loop2
-	call RTC
+	call UpdateTimeAndPals
 	call .TryAnims
 	ret c
 	ld a, [w2DMenuFlags1]
diff --git a/engine/menus/menu.asm b/engine/menus/menu.asm
index 37775963b..2a90c6f90 100644
--- a/engine/menus/menu.asm
+++ b/engine/menus/menu.asm
@@ -344,7 +344,7 @@ MenuJoypadLoop:
 
 Do2DMenuRTCJoypad:
 .loopRTC
-	call RTC
+	call UpdateTimeAndPals
 	call Menu_WasButtonPressed
 	ret c
 	ld a, [w2DMenuFlags1]
diff --git a/home/joypad.asm b/home/joypad.asm
index b39f8c0f4..cfc94a4be 100644
--- a/home/joypad.asm
+++ b/home/joypad.asm
@@ -295,7 +295,7 @@ JoyWaitAorB::
 	ldh a, [hJoyPressed]
 	and A_BUTTON | B_BUTTON
 	ret nz
-	call RTC
+	call UpdateTimeAndPals
 	jr .loop
 
 WaitButton::
@@ -413,7 +413,7 @@ PromptButton::
 	ldh a, [hJoyPressed]
 	and A_BUTTON | B_BUTTON
 	jr nz, .received_input
-	call RTC
+	call UpdateTimeAndPals
 	ld a, $1
 	ldh [hBGMapMode], a
 	call DelayFrame
diff --git a/home/names.asm b/home/names.asm
index 434eb17d5..d509953c7 100644
--- a/home/names.asm
+++ b/home/names.asm
@@ -125,7 +125,7 @@ GetPokemonName::
 	ld e, a
 	ld h, 0
 	ld l, a
-	add hl, hl ; hl = hl * 4
+	add hl, hl ; hl = hl * 2
 	add hl, hl ; hl = hl * 4
 	add hl, de ; hl = (hl*4) + de
 	add hl, hl ; hl = (5*hl) + (5*hl)
diff --git a/home/rtc.asm b/home/rtc.asm
index 0e5550485..7dc4e776a 100644
--- a/home/rtc.asm
+++ b/home/rtc.asm
@@ -1,4 +1,4 @@
-RTC::
+UpdateTimeAndPals::
 ; update time and time-sensitive palettes
 
 ; rtc enabled?