Merge pull request #234 from KDSKardabox/master

Port map_obj_lock, map_name_popup, rom6 & script_movement

3 files changed, 4 insertions, 73 deletions

diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s
index 1a877daa9..c06497093 100644
--- a/data/field_effect_scripts.s
+++ b/data/field_effect_scripts.s
@@ -223,7 +223,7 @@ gFieldEffectScript_SandDisguisePlaceholder:: @ 82DBC09
 	field_eff_end
 
 gFieldEffectScript_UseRockSmash:: @ 82DBC0F
-	field_eff_callnative oei_rocksmash
+	field_eff_callnative FldEff_UseRockSmash
 	field_eff_end
 
 gFieldEffectScript_Unknown40:: @ 82DBC15
@@ -231,7 +231,7 @@ gFieldEffectScript_Unknown40:: @ 82DBC15
 	field_eff_end
 
 gFieldEffectScript_Unknown38:: @ 82DBC1B
-	field_eff_callnative sub_8135780
+	field_eff_callnative FldEff_UseDig
 	field_eff_end
 
 gFieldEffectScript_Unknown39:: @ 82DBC21
diff --git a/data/map_name_popup.s b/data/map_name_popup.s
deleted file mode 100644
index 7dc1da808..000000000
--- a/data/map_name_popup.s
+++ /dev/null
@@ -1,69 +0,0 @@
-    .include "asm/macros.inc"
-    .include "constants/constants.inc"
-
-    .section .rodata
-    .align 2, 0
-
-gMapPopUp_Table:: @ 857C684
-	.incbin "graphics/interface/map_popup/wood.4bpp"
-	.incbin "graphics/interface/map_popup/marble.4bpp"
-	.incbin "graphics/interface/map_popup/stone.4bpp"
-	.incbin "graphics/interface/map_popup/brick.4bpp"
-	.incbin "graphics/interface/map_popup/underwater.4bpp"
-	.incbin "graphics/interface/map_popup/stone2.4bpp"
-
-gMapPopUp_Outline_Table:: @ 857DD04
-	.incbin "graphics/interface/map_popup/wood_outline.4bpp"
-	.incbin "graphics/interface/map_popup/marble_outline.4bpp"
-	.incbin "graphics/interface/map_popup/stone_outline.4bpp"
-	.incbin "graphics/interface/map_popup/brick_outline.4bpp"
-	.incbin "graphics/interface/map_popup/underwater_outline.4bpp"
-	.incbin "graphics/interface/map_popup/stone2_outline.4bpp"
-
-gMapPopUp_Palette_Table:: @ 857F384
-	.incbin "graphics/interface/map_popup/wood.gbapal"
-	.incbin "graphics/interface/map_popup/marble.gbapal"
-	.incbin "graphics/interface/map_popup/stone.gbapal"
-	.incbin "graphics/interface/map_popup/brick.gbapal"
-	.incbin "graphics/interface/map_popup/underwater.gbapal"
-	.incbin "graphics/interface/map_popup/stone2.gbapal"
-
-gUnknown_0857F444:: @ 857F444
-	.incbin "graphics/interface/map_popup/857F444.gbapal"
-
-gUnknown_0857F464:: @ 857F464
-	.byte 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x01, 0x01, 0x01, 0x03, 0x01, 0x03, 0x01, 0x03, 0x00, 0x00, 0x00, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x05, 0x05, 0x05, 0x05, 0x05, 0x02, 0x02, 0x00, 0x01, 0x00, 0x02, 0x00, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x05, 0x02, 0x00, 0x02, 0x00, 0x02, 0x02, 0x00, 0x00, 0x02, 0x05, 0x02, 0x02, 0x02, 0x02, 0x00, 0x02, 0x02, 0x01, 0x02, 0x02, 0x02, 0x00, 0x00, 0x02, 0x02, 0x05, 0x02, 0x05, 0x05, 0x05, 0x02, 0x02, 0x02, 0x01
-	
-gUnknown_0857F4CC:: @ 857F4CC
-	.string "PYRAMID FLOOR 1$"
-	
-gUnknown_0857F4DC:: @ 857F4DC
-	.string "PYRAMID FLOOR 2$"
-	
-gUnknown_0857F4EC:: @ 857F4EC
-	.string "PYRAMID FLOOR 3$"
-	
-gUnknown_0857F4FC:: @ 857F4FC
-	.string "PYRAMID FLOOR 4$"
-	
-gUnknown_0857F50C:: @ 857F50C
-	.string "PYRAMID FLOOR 5$"
-	
-gUnknown_0857F51C:: @ 857F51C
-	.string "PYRAMID FLOOR 6$"
-	
-gUnknown_0857F52C:: @ 857F52C
-	.string "PYRAMID FLOOR 7$"
-	
-gUnknown_0857F53C:: @ 857F53C
-	.string "PYRAMID$"
-
-gUnknown_0857F544:: @ 857F544
-	.4byte gUnknown_0857F4CC
-	.4byte gUnknown_0857F4DC
-	.4byte gUnknown_0857F4EC
-	.4byte gUnknown_0857F4FC
-	.4byte gUnknown_0857F50C
-	.4byte gUnknown_0857F51C
-	.4byte gUnknown_0857F52C
-	.4byte gUnknown_0857F53C
diff --git a/data/party_menu.s b/data/party_menu.s
index b60a1f927..ebd596870 100644
--- a/data/party_menu.s
+++ b/data/party_menu.s
@@ -433,14 +433,14 @@ gUnknown_08615D7E:: @ 8615D7E
 gUnknown_08615D9C:: @ 8615D9C
 	.4byte sub_80D3718, 0x00000007
 	.4byte SetUpFieldMove_Flash, 0x0000000d
-	.4byte sub_8135654, 0x0000000d
+	.4byte SetUpFieldMove_RockSmash, 0x0000000d
 	.4byte SetUpFieldMove_Strength, 0x0000000d
 	.4byte sub_81B5820, 0x00000008
 	.4byte sub_81B5884, 0x0000000d
 	.4byte sub_81B5974, 0x0000000d
 	.4byte hm_prepare_waterfall, 0x0000000d
 	.4byte SetUpFieldMove_Teleport, 0x0000000d
-	.4byte sub_813572C, 0x0000000d
+	.4byte SetUpFieldMove_Dig, 0x0000000d
 	.4byte sub_80FA004, 0x0000000d
 	.4byte SetUpFieldMove_SoftBoiled, 0x00000010
 	.4byte SetUpFieldMove_SoftBoiled, 0x00000010