diff --git a/LTTP_RND_GeneralBugfixes.asm b/LTTP_RND_GeneralBugfixes.asm
index 373785a..9e058fd 100644
--- a/LTTP_RND_GeneralBugfixes.asm
+++ b/LTTP_RND_GeneralBugfixes.asm
@@ -470,8 +470,14 @@ Sprite_SetSpawnedCoords:
 org $09AD58
 GiveRupeeGift:
 
-org $1CFD69
-Main_ShowTextMessage:
+org $0ABA4F
+OverworldMap_InitGfx:
+
+org $0ABA99
+OverworldMap_DarkWorldTilemap:
+
+org $0ABAB9
+OverworldMap_LoadSprGfx:
 
 org $0DBA71
 GetRandomInt:
@@ -543,6 +549,9 @@ ShopKeeper_RapidTerminateReceiveItem:
 org $1CF500
 Sprite_NullifyHookshotDrag:
 
+org $1CFD69
+Main_ShowTextMessage:
+
 org $1DF65D
 Sprite_SpawnDynamically:
 
diff --git a/dpadinvert.asm b/dpadinvert.asm
index 52b78fd..130455f 100644
--- a/dpadinvert.asm
+++ b/dpadinvert.asm
@@ -6,7 +6,7 @@
 ; Filtered Joypad 1 Register: [BYST | udlr] [AXLR | ????]
 !INVERT_DPAD = "$7F50CB"
 InvertDPad:
-	LDA !INVERT_DPAD : BEQ .normal
+	LDA !INVERT_DPAD : BNE + : BRL .normal : +
 	DEC : BEQ .dpadOnly
 	DEC : BEQ .buttonsOnly
 	DEC : BEQ .invertBoth
diff --git a/events.asm b/events.asm
index 9a3e087..dec89a2 100644
--- a/events.asm
+++ b/events.asm
@@ -143,6 +143,19 @@ OnOWTransition:
 	PLP
 RTL
 ;--------------------------------------------------------------------------------
+!DARK_DUCK_TEMP = "$7F509C"
+OnLoadDuckMap:
+	LDA !DARK_DUCK_TEMP
+	BNE +
+		INC : STA !DARK_DUCK_TEMP
+		JSL OverworldMap_InitGfx : DEC $0200
+		
+		RTL
+	+
+	LDA.b #$00 : STA !DARK_DUCK_TEMP
+	JSL OverworldMap_DarkWorldTilemap
+RTL
+;--------------------------------------------------------------------------------
 PreItemGet:
 	LDA.b #$01 : STA !ITEM_BUSY ; mark item as busy
 RTL
diff --git a/hooks.asm b/hooks.asm
index 4f3147d..4d6b7ee 100644
--- a/hooks.asm
+++ b/hooks.asm
@@ -58,6 +58,13 @@ org $02E21B ; <- 1621B - Bank02.asm : 11211 (STA $040C)
 JSL.l OnDungeonExit : NOP #2
 ;--------------------------------------------------------------------------------
 
+;================================================================================
+; Duck Map Load Hook
+;--------------------------------------------------------------------------------
+org $0AB76E ; <- 5376E - Bank0A.asm : 30 (JSL OverworldMap_InitGfx)
+JSL.l OnLoadDuckMap
+;--------------------------------------------------------------------------------
+
 ;================================================================================
 ; Infinite Bombs / Arrows / Magic
 ;--------------------------------------------------------------------------------
diff --git a/tables.asm b/tables.asm
index c376a3c..30dcdaf 100644
--- a/tables.asm
+++ b/tables.asm
@@ -201,7 +201,7 @@ db #$00 ; #$00 = Press Start (default) - #$10 = Release Start
 ;--------------------------------------------------------------------------------
 org $30804A ; PC 0x18004A
 InvertedMode:
-db #$01 ; #$00 = Normal (default) - #$01 = Inverted
+db #$00 ; #$00 = Normal (default) - #$01 = Inverted
 ;--------------------------------------------------------------------------------
 org $30804B ; PC 0x18004B
 QuickSwapFlag:
@@ -1382,6 +1382,10 @@ db $04
 ;org $02E849 ; PC 0x16849 (Bank02.asm:11641)
 ;;dw $0003, $0016, $0018, $002C, $002F, $0030, $003B, $003F ; Light World Flute Spots
 ;dw $0043, $0056, $0058, $006C, $006F, $0070, $007B, $007F ; Dark World Flute Spots
+;org $02E8D5 ; PC 0x168D5 (Bank02.asm:11661) ($07B7)
+;dw $07C8 ; $07B7 - Normal Location 3 Y (Default), $07C7 - Inverted Location 3 Y
+;org $02E8F7; PC 0x168F7 (Bank02.asm:11661) ($07B7)
+;dw $01F8 ; $0200 - Normal Location 3 X (Default), $0200 - Inverted Location 3 X
 ;;--------------------------------------------------------------------------------
 ;;Mirror
 ;org $07A943 ; PC 0x3A943 (Bank07.asm:6548) (BNE)
@@ -1470,6 +1474,7 @@ dw #9999 ; Rupee Limit
 ; $7F5099 - Last Entered Overworld Door ID
 ; $7F509A - (Reserved)
 ; $7F509B - MSU Flag
+; $7F509C - Inverted Mode Duck Map Temporary
 
 ; $7F50A0 - Event Parameter 1