From 9baa39f7082acfb1eb8b75603e440773504ad206 Mon Sep 17 00:00:00 2001
From: sceptillion <33798691+sceptillion@users.noreply.github.com>
Date: Sat, 18 Nov 2017 23:35:08 -0800
Subject: decompile fldeff_recordmixing

---
 data/fldeff_recordmixing.s | 45 ---------------------------------------------
 1 file changed, 45 deletions(-)
 delete mode 100755 data/fldeff_recordmixing.s

(limited to 'data')

diff --git a/data/fldeff_recordmixing.s b/data/fldeff_recordmixing.s
deleted file mode 100755
index ee9d6b8d6..000000000
--- a/data/fldeff_recordmixing.s
+++ /dev/null
@@ -1,45 +0,0 @@
-	.include "asm/macros.inc"
-	.include "constants/constants.inc"
-
-	.section .rodata
-
-	.align 2
-gSpriteImage_83D26C0:: @ 83D26C0
-	.incbin "graphics/unknown_sprites/83D2860/0.4bpp"
-
-	.align 2
-gSpriteImage_83D2740:: @ 83D2740
-	.incbin "graphics/unknown_sprites/83D2860/1.4bpp"
-
-	.align 2
-gSpriteImage_83D27C0:: @ 83D27C0
-	.incbin "graphics/unknown_sprites/83D2860/2.4bpp"
-
-	.align 2
-Palette_3D2840:: @ 83D2840
-	.incbin "graphics/unknown/unknown_3D2840.gbapal"
-
-	.align 2
-gSpriteImageTable_83D2860:: @ 83D2860
-	obj_frame_tiles gSpriteImage_83D26C0, 0x80
-	obj_frame_tiles gSpriteImage_83D2740, 0x80
-	obj_frame_tiles gSpriteImage_83D27C0, 0x80
-
-	.align 2
-gUnknown_083D2878:: @ 83D2878
-	obj_pal Palette_3D2840, 4096
-
-	.align 2
-gSpriteAnim_83D2880:: @ 83D2880
-	obj_image_anim_frame 0, 30
-	obj_image_anim_frame 1, 30
-	obj_image_anim_frame 2, 30
-	obj_image_anim_jump 0
-
-	.align 2
-gSpriteAnimTable_83D2890:: @ 83D2890
-	.4byte gSpriteAnim_83D2880
-
-	.align 2
-gSpriteTemplate_83D2894:: @ 83D2894
-	spr_template 0xFFFF, 4096, gFieldOamData_32x8, gSpriteAnimTable_83D2890, gSpriteImageTable_83D2860, gDummySpriteAffineAnimTable, SpriteCallbackDummy
-- 
cgit v1.2.3


From e0e5d070fa7a19235c6e8ba9b57b618ff86b8895 Mon Sep 17 00:00:00 2001
From: sceptillion <33798691+sceptillion@users.noreply.github.com>
Date: Sun, 19 Nov 2017 01:31:09 -0800
Subject: decompile fldeff_secret_base_pc

---
 data/event_scripts.s        | 8 ++++----
 data/field_effect_scripts.s | 2 +-
 data/specials.inc           | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'data')

diff --git a/data/event_scripts.s b/data/event_scripts.s
index 854b52c9e..6d2a3693c 100644
--- a/data/event_scripts.s
+++ b/data/event_scripts.s
@@ -486,7 +486,7 @@ EventScript_15F4A1:
 	goto_if_eq EventScript_15F452
 	msgbox UnknownString_81A3A22, 3
 	special sub_80BC5BC
-	special sub_80C683C
+	special DoSecretBasePCTurnOffEffect
 	releaseall
 	end
 
@@ -496,13 +496,13 @@ EventScript_15F4E0:
 	goto_if_eq EventScript_15F452
 	msgbox UnknownString_81A3A3A, 3
 	special sub_80BC5BC
-	special sub_80C683C
+	special DoSecretBasePCTurnOffEffect
 	releaseall
 	end
 
 EventScript_15F503:
 	msgbox UnknownString_81A39C0, 3
-	special sub_80C683C
+	special DoSecretBasePCTurnOffEffect
 	closemessage
 	releaseall
 	end
@@ -514,7 +514,7 @@ EventScript_15F511:
 	end
 
 EventScript_15F51D:
-	special sub_80C683C
+	special DoSecretBasePCTurnOffEffect
 	closemessage
 	releaseall
 	end
diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s
index aabb1252d..8e6a6d877 100644
--- a/data/field_effect_scripts.s
+++ b/data/field_effect_scripts.s
@@ -318,7 +318,7 @@ gFieldEffectScript_UseFlyAncientTomb: @ 81D9E26
 	end
 
 gFieldEffectScript_PCTurnOn: @ 81D9E2C
-	callnative FldEff_PCTurnOn
+	callnative FldEff_SecretBasePCTurnOn
 	end
 
 gFieldEffectScript_HallOfFameRecord: @ 81D9E32
diff --git a/data/specials.inc b/data/specials.inc
index efa8da174..2924f2173 100644
--- a/data/specials.inc
+++ b/data/specials.inc
@@ -33,7 +33,7 @@ gSpecials::
 	def_special sub_8100A7C
 	def_special sub_80BBC78
 	def_special sub_80BCE4C
-	def_special sub_80C683C
+	def_special DoSecretBasePCTurnOffEffect
 	def_special sub_80B929C
 	def_special sub_808347C
 	def_special sub_80834E4
-- 
cgit v1.2.3


From 98c1ea205b7d700ae466acbed9910fa1d55eb94c Mon Sep 17 00:00:00 2001
From: sceptillion <33798691+sceptillion@users.noreply.github.com>
Date: Sun, 19 Nov 2017 01:33:24 -0800
Subject: update field effect script label

---
 data/field_effect_scripts.s | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'data')

diff --git a/data/field_effect_scripts.s b/data/field_effect_scripts.s
index 8e6a6d877..900cc7009 100644
--- a/data/field_effect_scripts.s
+++ b/data/field_effect_scripts.s
@@ -67,7 +67,7 @@ gFieldEffectScriptPointers:: @ 81D9B34
 	.4byte gFieldEffectScript_CutGrass
 	.4byte gFieldEffectScript_FieldMoveShowMonInit
 	.4byte gFieldEffectScript_UseFlyAncientTomb
-	.4byte gFieldEffectScript_PCTurnOn
+	.4byte gFieldEffectScript_SecretBasePCTurnOn
 	.4byte gFieldEffectScript_HallOfFameRecord
 	.4byte gFieldEffectScript_UseTeleport
 
@@ -317,7 +317,7 @@ gFieldEffectScript_UseFlyAncientTomb: @ 81D9E26
 	callnative FldEff_UseFlyAncientTomb
 	end
 
-gFieldEffectScript_PCTurnOn: @ 81D9E2C
+gFieldEffectScript_SecretBasePCTurnOn: @ 81D9E2C
 	callnative FldEff_SecretBasePCTurnOn
 	end
 
-- 
cgit v1.2.3