From 686a1a0633f449361d8281dfb0f4d2bcbc315602 Mon Sep 17 00:00:00 2001
From: aaaaaa123456789 <aaaaaa123456789@acidch.at>
Date: Thu, 6 Jul 2017 18:28:11 -0300
Subject: Updated code to comply with newer rgbds (and remove unnecessary
 memory access brackets where there is no memory access)

---
 .gitignore          |  1 +
 audio/engine_0f.asm |  4 ++--
 audio/engine_10.asm |  4 ++--
 audio/engine_11.asm |  4 ++--
 audio/engine_12.asm |  4 ++--
 audio/engine_13.asm |  4 ++--
 engine/pokedex.asm  |  2 +-
 home.asm            | 12 ++++++------
 home/text.asm       |  4 ++--
 9 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/.gitignore b/.gitignore
index 9f6a321..4d424b4 100755
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@
 
 # rgbds extras
 *.sym
+*.map
 
 # swap files for vim
 .*.swp
diff --git a/audio/engine_0f.asm b/audio/engine_0f.asm
index 2a58a0e..395c3c5 100755
--- a/audio/engine_0f.asm
+++ b/audio/engine_0f.asm
@@ -381,7 +381,7 @@ Func_3c24d: ; 0x3c24d
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 PointerTable_3c25e: ; 0x3c25e
 	dw Func_3c26e
@@ -1231,7 +1231,7 @@ Func_3c786: ; 0x3c786
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 PointerTable_3c797: ; 0x3c797
 	dw Func_3c9b6
diff --git a/audio/engine_10.asm b/audio/engine_10.asm
index 3e94953..7f525c7 100755
--- a/audio/engine_10.asm
+++ b/audio/engine_10.asm
@@ -376,7 +376,7 @@ Func_4024d:
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 PointerTable_4025e:
 	dw Func_4026e
@@ -1226,7 +1226,7 @@ Func_40786:
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 PointerTable_40797:
 	dw Func_409b6
diff --git a/audio/engine_11.asm b/audio/engine_11.asm
index 53a9f8f..7d04f53 100755
--- a/audio/engine_11.asm
+++ b/audio/engine_11.asm
@@ -376,7 +376,7 @@ Func_4424d:
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 PointerTable_4425e:
 	dw Func_4426e
@@ -1226,7 +1226,7 @@ Func_44786:
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 PointerTable_44797:
 	dw Func_449b6
diff --git a/audio/engine_12.asm b/audio/engine_12.asm
index d0e5fe9..9623f0c 100755
--- a/audio/engine_12.asm
+++ b/audio/engine_12.asm
@@ -376,7 +376,7 @@ Func_4824d:
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 PointerTable_4825e:
 	dw Func_4826e
@@ -1226,7 +1226,7 @@ Func_48786:
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 PointerTable_48797:
 	dw Func_489b6
diff --git a/audio/engine_13.asm b/audio/engine_13.asm
index bf4b45f..ebacaf3 100755
--- a/audio/engine_13.asm
+++ b/audio/engine_13.asm
@@ -376,7 +376,7 @@ Func_4c24d:
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 PointerTable_4c25e:
 	dw Func_4c26e
@@ -1226,7 +1226,7 @@ Func_4c786:
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 PointerTable_4c797:
 	dw Func_4c9b6
diff --git a/engine/pokedex.asm b/engine/pokedex.asm
index 8b624a4..7f7eddd 100755
--- a/engine/pokedex.asm
+++ b/engine/pokedex.asm
@@ -928,7 +928,7 @@ Func_285db: ; 0x285db
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 PointerTable_2867f: ; 0x2867f
 	dw Func_286dd
diff --git a/home.asm b/home.asm
index 1eb9f2f..e23bce0 100755
--- a/home.asm
+++ b/home.asm
@@ -307,7 +307,7 @@ VBlank: ; 0x2f2
 	ld a, [hNewlyPressedButtons]
 	and $f
 	jr z, .skipBootCheck
-	ld hl, [sp+$8]
+	ld hl, sp + 8
 	ld [hl], Func_3c3 & $ff
 	inc hl
 	ld [hl], Func_3c3 >> 8
@@ -410,7 +410,7 @@ LCD: ; 0x3ec
 	ld a, [hli]
 	ld h, [hl]
 	ld l, a
-	jp [hl]
+	jp hl
 
 Func_3ff: ; 0x3ff
 	ld a, $1
@@ -518,7 +518,7 @@ JumpToFuncInTable: ; 0x477
 	ld l, e
 	ld h, d
 	pop de
-	jp [hl]
+	jp hl
 
 Func_486: ; 0x486
 	rlca
@@ -656,7 +656,7 @@ BankSwitchSimple: ; 0x549
 ; Switches to Bank in register a and jumps to hl.
 	ld [hLoadedROMBank], a
 	ld [MBC5RomBank], a  ; Load Bank
-	jp [hl]
+	jp hl
 
 BankSwitch: ; 0x54f
 	ld e, a
@@ -686,7 +686,7 @@ BankSwitch: ; 0x54f
 	ld a, [hFarCallTempE]
 	ld e, a
 	ld a, [hFarCallTempA]
-	jp [hl]
+	jp hl
 
 Func_576: ; 0x576
 	ld a, [rLCDC]
@@ -2739,7 +2739,7 @@ Func_113a: ; 0x113a
 	ret
 
 JumpToHL: ; 0x117a
-	jp [hl]
+	jp hl
 
 LoadTileLists: ; 0x117b
 ; Loads a series of defined tile ids into VRAM
diff --git a/home/text.asm b/home/text.asm
index 72cec7e..1901676 100755
--- a/home/text.asm
+++ b/home/text.asm
@@ -380,7 +380,7 @@ Func_32cc: ; 0x32cc
 	pop af
 	ld e, a
 	ld d, wBottomMessageText / $100
-	ld hl, [sp+$5]
+	ld hl, sp + 5
 	lb bc, 8, 1
 .asm_32ec
 	ld a, [hl]
@@ -519,7 +519,7 @@ Func_3372: ; 0x3372
 	pop af
 	ld e, a
 	ld d, wBottomMessageText / $100
-	ld hl, [sp+$5]
+	ld hl, sp + 5
 	lb bc, 8, 1
 .asm_338a
 	ld a, [hl]
-- 
cgit v1.2.3