Fixed things I messed up during porting.

2.05-custom-gx/action.hsp

@@ -2288,13 +2288,6 @@
 						goto *map_exit
 					}
 					if ( encounter == 3 ) {
-						if ( gdata(GDATA_FLAG_WORLD_MAP_VEHICLE_KIND) == VEHICLE_LAND_BATTLESHIP ) {
-							txt lang("行商人に変装していた暗殺者が襲いかかってきた。あなたはクライアントを守らなければならない。", "You are caught by assassins disguised as a wandering merchant and their crew. You have to protect your client.")
-						}
-						if ( gdata(GDATA_FLAG_WORLD_MAP_VEHICLE_KIND) != VEHICLE_LAND_BATTLESHIP ) {
-							txt lang("暗殺者につかまった。あなたはクライアントを守らなければならない。", "You are caught by assassins. You have to protect your client.")
-						}
-						msg_halt
 						gdata(GDATA_RETURN_AREA) = gdata(GDATA_AREA), gdata(GDATA_LEVEL), cdata(CDATA_X, CHARA_PLAYER), cdata(CDATA_Y, CHARA_PLAYER)
 						levelexitby = 4
 						goto *map_exit

2.05-custom-gx/blend.hsp

@@ -1112,8 +1112,8 @@
 	rfnameorg(RFNAMEORG_ID, RF_SEED - EXT_RF) = "seed", lang("適当な種", "any seed")
 	rfnameorg(RFNAMEORG_ID, RF_VEGE - EXT_RF) = "vege", lang("適当な野菜", "any vege")
 	rfnameorg(RFNAMEORG_ID, RF_DIARY - EXT_RF) = "diary", lang("日記帳", "any diary")
-	rfnameorg(RFNAMEORG_ID, RF_POISON - EXT_RF) = "poison", lang("状態異常薬", "nega potion")
-	rfnameorg(RFNAMEORG_ID, RF_DEBUFF_POTION - EXT_RF) = "poison", lang("デバフ薬", "debuff potion")
+	rfnameorg(RFNAMEORG_ID, RF_POISON - EXT_RF) = "poison", lang("状態異常薬", "toxic potion")
+	rfnameorg(RFNAMEORG_ID, RF_DEBUFF_POTION - EXT_RF) = "debuff", lang("デバフ薬", "debuff potion")
 	rfnameorg(RFNAMEORG_ID, RF_FRUIT - EXT_RF) = "fruit", lang("適当な果物", "any fruit")
 	rfnameorg(RFNAMEORG_ID, RF_BREAD - EXT_RF) = "bread", lang("パン類", "any bread")
 	rfnameorg(RFNAMEORG_ID, RF_ALE - EXT_RF) = "ale", lang("適当なアルコール", "any alcohol")

2.05-custom-gx/chat.hsp

@@ -24069,11 +24069,12 @@
 			if ( cdata(CDATA_HEART_LOCK_RELATION, tc) == (-4) ) {
 				s = _impressiona4(implevel(cdata(CDATA_IMPRESSION, tc)))
 			}
+			// CUSTOM: I flipped 5 and 6 because it's weird
 			if ( cdata(CDATA_HEART_LOCK_RELATION, tc) == (-5) ) {
-				s = _impressiona5(implevel(cdata(CDATA_IMPRESSION, tc)))
+				s = _impressiona6(implevel(cdata(CDATA_IMPRESSION, tc)))
 			}
 			if ( cdata(CDATA_HEART_LOCK_RELATION, tc) == (-6) ) {
-				s = _impressiona6(implevel(cdata(CDATA_IMPRESSION, tc)))
+				s = _impressiona5(implevel(cdata(CDATA_IMPRESSION, tc)))
 			}
 			if ( cdata(CDATA_HEART_LOCK_RELATION, tc) == (-7) ) {
 				s = _impressiona7(implevel(cdata(CDATA_IMPRESSION, tc)))

2.05-custom-gx/command.hsp

@@ -2346,6 +2346,8 @@
 
 				cnv_str listn(0, cnt), " your", " " + his(tc, 1)
 				cnv_str listn(0, cnt), " you", " " + him2(tc)
+				cnv_str listn(0, cnt), "Your", "" + his(tc, 1)
+				cnv_str listn(0, cnt), "You", "" + him2(tc)
 
 				/********** BLOODYSHADE CUSTOM - ENDING **********/
 
@@ -7112,45 +7114,73 @@
 				}
 				return 1
 			} else {
-				f = 0
-				if ( cdata(CDATA_PLATINUM, CHARA_PLAYER) >= userdata(2, knowCNPC) ) {
-					txtef COLOR_YELLOW
-					txt lang("..？", "Summon them as friendly npc? It will cost you " + userdata(2, knowCNPC) + " plantinum coins.")
-					promptYesNo
-					if ( rtval == 0 ) {
-						cdata(CDATA_PLATINUM, CHARA_PLAYER) -= userdata(2, knowCNPC)
-						f = 1
-					}
-				}
-				initunid = findunid(userdatan(0, knowCNPC))
-				txtef COLOR_GREEN
-				txt lang("カスタムNPCを召喚した！", "A custom NPC has been successfully summoned from another world!")
-				if ( cdata(CDATA_X, CHARA_PLAYER) > 1 ) {
-					sux = cdata(CDATA_X, CHARA_PLAYER) - 1
+				ppcost1@NE = userdata(2, knowCNPC)
+				ppcost2@NE = (userdata(2, knowCNPC) / 3)
+				if ( ppcost1@NE < 5 ) { ppcost1@NE = 5 }
+				if ( ppcost2@NE < 2 ) { ppcost2@NE = 2 }
+				redraw 0
+				txtnew
+				txt lang("[CNPC召喚]何をする？", "[CNPC Summon] What do you want to do?")
+				promptAdd "Summon as friendly. (" + ppcost1@NE + " pp)", "null", 1
+				promptAdd "Summon as neutral. (" + ppcost2@NE + " pp)", "null", 2
+				promptAdd "Summon as enemy.", "null", 3
+				promptAdd "Cancel.", "null", 0
+				val = promptx, prompty, 280, 1
+				gosub *prompt_key
+				gosub *screen_draw
+				rtval@NE = rtval
+				if ( rtval@NE == 0 ) {
+					return 1
 				}
-				flt
-				characreate -1, CREATURE_ID_USER, sux, cdata(CDATA_Y, CHARA_PLAYER)
-				repeat MAX_CHARA_TOTAL
-					if ( cdata(CDATA_ID, cnt) == CREATURE_ID_USER ) {
-						getunid cnt
+				if ( rtval@NE >= 1 & rtval@NE <= 3 ) {
+					if ( rtval@NE == 1 ) {
+						if ( cdata(CDATA_PLATINUM, CHARA_PLAYER) < ppcost1@NE ) {
+							txt lang("「足りないんよ」", cnvtalk("Not enough!"))
+							return 1
+						}
+						cdata(CDATA_PLATINUM, CHARA_PLAYER) -= ppcost1@NE
 					}
-				loop
-				txtef COLOR_YELLOW
-				if ( f == 1 ) {
-					cdata(CDATA_RELATION, rc) = (-1)
-					cdata(CDATA_RELATION_ORG, rc) = (-1)
-					if ( mdata(MDATA_TYPE) == MAP_TYPE_HOME ) {
+					if ( rtval@NE == 2 ) {
+						if ( cdata(CDATA_PLATINUM, CHARA_PLAYER) < ppcost2@NE ) {
+							txt lang("「足りないんよ」", cnvtalk("Not enough!"))
+							return 1
+						}
+						cdata(CDATA_PLATINUM, CHARA_PLAYER) -= ppcost2@NE
+					}
+
+					initunid = findunid(userdatan(0, knowCNPC))
+					txtef COLOR_GREEN
+					txt lang("カスタムNPCを召喚した！", "A custom NPC has been successfully summoned from another world!")
+					if ( cdata(CDATA_X, CHARA_PLAYER) > 1 ) {
+						sux = cdata(CDATA_X, CHARA_PLAYER) - 1
+					}
+					flt
+					characreate -1, CREATURE_ID_USER, sux, cdata(CDATA_Y, CHARA_PLAYER)
+					repeat MAX_CHARA_TOTAL
+						if ( cdata(CDATA_ID, cnt) == CREATURE_ID_USER ) {
+							getunid cnt
+						}
+					loop
+					txtef COLOR_YELLOW
+					if ( rtval@NE == 1 ) {
 						cdata(CDATA_RELATION, rc) = 0
 						cdata(CDATA_RELATION_ORG, rc) = 0
+						// Disable follow on talkable NPC so they don't annoy player that much
 						if ( cdata(CDATA_AI_CALM, rc) == 4 | cdata(CDATA_AI_CALM, rc) == 5 ) {
 							cdata(CDATA_AI_CALM, rc) = 0
 						}
+						txt lang(name(rc) + "は興奮して襲い掛かってきた。", cdatan(CDATAN_NAME, rc) + " is excited!")
+					}
+					if ( rtval@NE == 2 ) {
+						cdata(CDATA_RELATION, rc) = (-1)
+						cdata(CDATA_RELATION_ORG, rc) = (-1)
+						txt lang(name(rc) + "は興奮して襲い掛かってきた。", cdatan(CDATAN_NAME, rc) + " is excited!")
+					}
+					if ( rtval@NE == 3 ) {
+						cdata(CDATA_RELATION, rc) = -3
+						cdata(CDATA_RELATION_ORG, rc) = -3
+						txt lang(name(rc) + "は興奮して襲い掛かってきた。", cdatan(CDATAN_NAME, rc) + " is confused and attacks you.")
 					}
-					txt lang(name(rc) + "は興奮して襲い掛かってきた。", cdatan(CDATAN_NAME, rc) + " is excited!")
-				} else {
-					cdata(CDATA_RELATION, rc) = -3
-					cdata(CDATA_RELATION_ORG, rc) = -3
-					txt lang(name(rc) + "は興奮して襲い掛かってきた。", cdatan(CDATAN_NAME, rc) + " is confused and attacks you.")
 				}
 				return 1
 			}

2.05-custom-gx/custom_tweaks.hsp

@@ -53,7 +53,7 @@ TweakData(69, 2) = "Revert post-2.13 experience formula changes."
 TweakData(70, 2) = "Disable urination from fear."
 TweakData(71, 2) = "Use CGX Map Layouts in Random Nefia."
 TweakData(72, 2) = "Use CGX Job Quests."
-TweakData(73, 2) = "Use CGX Arrow/Bolt/Ball Spell Animation."
+TweakData(73, 2) = "Disable Random CNPC spawn."
 TweakData(74, 2) = "Use summoning crystals to summon Custom NPCs."
 TweakData(75, 2) = "Revert post-2.17 skill exp formula changes."
 TweakData(76, 2) = "Make necromancy minions actively seek out enemies like pets do."
@@ -72,6 +72,7 @@ TweakData(3, 4) = "Prevent home stayers from moving."
 TweakData(50, 4) = "Fist of the North Star Mode."
 TweakData(51, 4) = "Disable cicada noises."
 TweakData(52, 4) = "Faster Fishing Animations."
+TweakData(53, 4) = "Use CGX Arrow/Bolt/Ball Spell Animation."
 */
 
 *TweakMenu
@@ -539,7 +540,7 @@ TweakData(52, 4) = "Faster Fishing Animations."
 	listn(0, 27) = "Disable urination from fear." + GetTStatus(TWEAK_CATEGORY_GAMEPLAY, TWEAK_GAMEPLAY_DISABLE_URINATION_FROM_FEAR)
 	listn(0, 28) = "Use CGX Map Layouts in Random Nefia." + GetTStatus(TWEAK_CATEGORY_GAMEPLAY, TWEAK_GAMEPLAY_USE_CUSTOM_NEFIA_TYPES) + "% Chance."
 	listn(0, 29) = "Use CGX Job Quests." + GetTStatus(TWEAK_CATEGORY_GAMEPLAY, TWEAK_GAMEPLAY_CUSTOM_JOB_QUESTS)
-	listn(0, 30) = "Use CGX Arrow/Bolt/Ball Spell Animation." + GetTStatus(TWEAK_CATEGORY_GAMEPLAY, TWEAK_GAMEPLAY_CUSTOM_SPELL_ANIMATIONS)
+	listn(0, 30) = "Disable Random Custom NPC spawns." + GetTStatus(TWEAK_CATEGORY_GAMEPLAY, TWEAK_GAMEPLAY_DISABLE_RANDOM_CNPC_SPAWN)
 	listn(0, 31) = "Use summoning crystals to summon Custom NPCs." + GetTStatus(TWEAK_CATEGORY_GAMEPLAY, TWEAK_GAMEPLAY_CUSTOM_CNPC_SUMMONING)
 	listn(0, 32) = "Revert post-2.17 skill exp formula changes." + GetTStatus(TWEAK_CATEGORY_GAMEPLAY, TWEAK_GAMEPLAY_REVERT_POST_217_EXP_CHANGES)
 	listn(0, 33) = "Necromancy Autotargeting." + GetTStatus(TWEAK_CATEGORY_GAMEPLAY, TWEAK_GAMEPLAY_NECROMANCY_ACTIVE_TARGETING)
@@ -660,10 +661,10 @@ TweakData(52, 4) = "Faster Fishing Animations."
 				s = "Delivery quests now marks the item and makes it heavier, but rewards more PP.\nEliminate quests now spawn targets in a group, civilians will also be spawned.\nHarvest quests now reward seeds based on your performance instead.\nPeople throw more music tickets at you during Party Quest."
 			}
 			if ( p == 30 ) {
-				s = "Use Custom Animation for Arrow/Bolt/Ball spell animations."
+				s = "This will disable Random CNPC spawn in all areas except Derphy and Melkawn."
 			}
 			if ( p == 31 ) {
-				s = "Play as a summoner. Summon CNPCS and monsters to help you in battle. \nYou can summon allied CNPCS in dungeons using god's favor, or at Home using PP. \nThis will also disable Random CNPC spawn in all areas except Derphy and Melkawn. \nThis will also change player summoned monsters in dungeons to be allied."
+				s = "Play as a summoner. Summon CNPCS and monsters to help you in battle. \nYou can summon allied CNPCS in dungeons using god's favor, or at Home using PP. \nThis will also change player summoned monsters in dungeons to be allied."
 			}
 			if ( p == 32 ) {
 				s = "Reverts changes to the skill experience formula after version 2.17.\nThis will lock your growth rate at 400% (100% compared to growth in 2.17)."
@@ -853,7 +854,7 @@ TweakData(52, 4) = "Faster Fishing Animations."
 	}
 	if ( p == 30 ) {
 		tc = TWEAK_CATEGORY_GAMEPLAY
-		tn = TWEAK_GAMEPLAY_CUSTOM_SPELL_ANIMATIONS
+		tn = TWEAK_GAMEPLAY_DISABLE_RANDOM_CNPC_SPAWN
 		gosub *ToggleTweak
 	}
 	if ( p == 31 ) {
@@ -997,10 +998,11 @@ TweakData(52, 4) = "Faster Fishing Animations."
 	listn(0, 5) = "Fist of the North Star Mode." + GetTStatus(TWEAK_CATEGORY_MISC, TWEAK_MISC_HOKUTO_NO_KEN_MODE)
 	listn(0, 6) = "Disable cicada noises." + GetTStatus(TWEAK_CATEGORY_MISC, TWEAK_MISC_DISABLE_CICADA_NOISES)
 	listn(0, 7) = "Faster Fishing Animation." + GetTStatus(TWEAK_CATEGORY_MISC, TWEAK_MISC_FASTER_FISHING)
-	listn(0, 8) = "Return."
+	listn(0, 8) = "Use CGX Arrow/Bolt/Ball Spell Animation." + GetTStatus(TWEAK_CATEGORY_MISC, TWEAK_MISC_CUSTOM_SPELL_ANIMATIONS)
+	listn(0, 9) = "Return."
 	font lang(cfg_font1, cfg_font2), 14 - en * 2, 0
 
-	repeat 9
+	repeat 10
 		key_list(cnt) = key_select(cnt)
 		keyrange = cnt + 1
 		pos wx + 38, wy + 40 + cnt * 19 - 2
@@ -1037,6 +1039,9 @@ TweakData(52, 4) = "Faster Fishing Animations."
 				s = "Makes fishing animations much faster. \nAnd instant dimensional fishing with a super lure."
 			}
 			if ( cnt == 8 ) {
+				s = "Use Custom Animation for Arrow/Bolt/Ball spell animations. \nIf it causes crashes, make sure you have the files in 'graphic/custom_animation' folder."
+			}
+			if ( cnt == 9 ) {
 				s = "Return to the previous menu."
 			}
 			pos wx + 38, wy + 343
@@ -1091,6 +1096,11 @@ TweakData(52, 4) = "Faster Fishing Animations."
 		gosub *ToggleTweak
 	}
 	if ( key == key_select(8) ) {
+		tc = TWEAK_CATEGORY_MISC
+		tn = TWEAK_MISC_CUSTOM_SPELL_ANIMATIONS
+		gosub *ToggleTweak
+	}
+	if ( key == key_select(9) ) {
 		snd SOUNDLIST_OK1
         return
 	}

2.05-custom-gx/db_card.hsp

@@ -10394,7 +10394,7 @@
 		cardrefcost = 0
 		cardrefattack = 690
 		cardrefhp = 3
-		cardrefn = lang("海賊", "pirate")
+		cardrefn = lang("盗賊ギルド", "thief guild member")
 		cardrefpic = xy2pic(10, 2) + COLOR_DEFAULT * COLOR_TINT_MULT
 		cardrefrace = "293 effect:" + skillname(cardrefattack) + " "
 		return 1

2.05-custom-gx/db_creature.hsp

@@ -34666,7 +34666,7 @@
 *db_creature_usernpc
 	repeat usernpcmax
 		/********** CUSTOM NPC SUMMONING - BEGINNING **********/
-		if ( TweakData(TWEAK_GAMEPLAY_CUSTOM_CNPC_SUMMONING, TWEAK_CATEGORY_GAMEPLAY) != 0 ) {
+		if ( TweakData(TWEAK_GAMEPLAY_DISABLE_RANDOM_CNPC_SPAWN, TWEAK_CATEGORY_GAMEPLAY) != 0 ) {
 			if ( gdata(GDATA_AREA) != AREA_MELKAWN & gdata(GDATA_AREA) != AREA_DERPHY ) {
 				break
 			}
@@ -98867,7 +98867,7 @@
 				return 30
 			}
 			if ( dbspec == DBSPEC_CHARA_NAME_ORG ) {
-				return lang("海賊", "pirate")
+				return lang("盗賊ギルド", "thief guild member")
 			}
 			if ( dbspec == DBSPEC_CHARA_FILTER ) {
 				return "" + "/man/"

2.05-custom-gx/defines/mod.hsp

@@ -7045,7 +7045,7 @@
 #define global	TWEAK_GAMEPLAY_DISABLE_URINATION_FROM_FEAR	70
 #define global	TWEAK_GAMEPLAY_USE_CUSTOM_NEFIA_TYPES	71
 #define global	TWEAK_GAMEPLAY_CUSTOM_JOB_QUESTS	72
-#define global	TWEAK_GAMEPLAY_CUSTOM_SPELL_ANIMATIONS	73
+#define global	TWEAK_GAMEPLAY_DISABLE_RANDOM_CNPC_SPAWN	73
 #define global	TWEAK_GAMEPLAY_CUSTOM_CNPC_SUMMONING	74
 #define global	TWEAK_GAMEPLAY_REVERT_POST_217_EXP_CHANGES	75
 #define global	TWEAK_GAMEPLAY_NECROMANCY_ACTIVE_TARGETING	76
@@ -7063,6 +7063,7 @@
 #define global	TWEAK_MISC_HOKUTO_NO_KEN_MODE	50
 #define global	TWEAK_MISC_DISABLE_CICADA_NOISES	51
 #define global	TWEAK_MISC_FASTER_FISHING   52
+#define global	TWEAK_MISC_CUSTOM_SPELL_ANIMATIONS	53
 
 // Custom AI
 #define global	CUSTOM_AI_ACTION_ATTACK_MELEE	1

2.05-custom-gx/event.hsp

@@ -2688,7 +2688,7 @@
 				txt lang("あなたは漁船の網を使った。", "You used the net of fishing ship.")
 			}
 			txtef COLOR_GREEN
-			txt lang("あっという間に魚が" + kazu + "匹獲れたが、残りには逃げられてしまった。", "You caught " + kazu + " fishs in no time, but the rest escaped.")
+			txt lang("あっという間に魚が" + kazu + "匹獲れたが、残りには逃げられてしまった。", "You caught " + kazu + " fishs in no time, but the rest of them got away.")
 			if ( gdata(GDATA_FLAG_SHIP_LAST_PORT) \ 100 == 11 ) {
 				if ( kaiwa == 0 ) {
 					flt

2.05-custom-gx/module.hsp

@@ -1242,7 +1242,7 @@
 				}
 			}
 			if ( locvar_cell_show_c != 0 ) {
-				if ( gdata(GDATA_FLAG_WORLD_MAP_VEHICLE_KIND) > 0 & mdata(MDATA_TYPE) == MAP_TYPE_WORLD | (gdata(GDATA_FLAG_SHIP_TYPE) > 0 & gdata(GDATA_AREA) == AREA_OCEAN) & cdata(CDATA_RELATION, locvar_cell_draw_c) == RELATION_ALLY ) {
+				if ( gdata(GDATA_FLAG_WORLD_MAP_VEHICLE_KIND) > 0 & mdata(MDATA_TYPE) == MAP_TYPE_WORLD | (gdata(GDATA_FLAG_SHIP_TYPE) > 0 & gdata(GDATA_AREA) == AREA_OCEAN & gdata(MDATA_TYPE) = MAP_TYPE_WORLD) & cdata(CDATA_RELATION, locvar_cell_draw_c) == RELATION_ALLY ) {
 					locvar_cell_show_c = 0
 				}
             }
@@ -1319,7 +1319,7 @@
 					}
 				}
 				if ( locvar_cell_show_c != 0 ) {
-					if ( gdata(GDATA_FLAG_WORLD_MAP_VEHICLE_KIND) > 0 & mdata(MDATA_TYPE) == MAP_TYPE_WORLD | (gdata(GDATA_FLAG_SHIP_TYPE) > 0 & gdata(GDATA_AREA) == AREA_OCEAN) & cdata(CDATA_RELATION, locvar_cell_show_c) == RELATION_ALLY ) {
+					if ( gdata(GDATA_FLAG_WORLD_MAP_VEHICLE_KIND) > 0 & mdata(MDATA_TYPE) == MAP_TYPE_WORLD | (gdata(GDATA_FLAG_SHIP_TYPE) > 0 & gdata(GDATA_AREA) == AREA_OCEAN & gdata(MDATA_TYPE) = MAP_TYPE_WORLD) & cdata(CDATA_RELATION, locvar_cell_show_c) == RELATION_ALLY ) {
 						locvar_cell_show_c = 0
 					}
 				}
@@ -2705,7 +2705,7 @@
 						}
 					}
 					if ( locvar_cell_draw_c != CHARA_PLAYER ) {
-						if ( gdata(GDATA_FLAG_WORLD_MAP_VEHICLE_KIND) > 0 & mdata(MDATA_TYPE) == MAP_TYPE_WORLD | (gdata(GDATA_FLAG_SHIP_TYPE) > 0 & gdata(GDATA_AREA) == AREA_OCEAN) & cdata(CDATA_RELATION, locvar_cell_show_c) == RELATION_ALLY ) {
+						if ( gdata(GDATA_FLAG_WORLD_MAP_VEHICLE_KIND) > 0 & mdata(MDATA_TYPE) == MAP_TYPE_WORLD | (gdata(GDATA_FLAG_SHIP_TYPE) > 0 & gdata(GDATA_AREA) == AREA_OCEAN & gdata(MDATA_TYPE) = MAP_TYPE_WORLD) & cdata(CDATA_RELATION, locvar_cell_show_c) == RELATION_ALLY ) {
 							locvar_cell_draw_c = 0
 						}
 					}
@@ -3327,7 +3327,7 @@
 								}
 							}
 							if ( locvar_cell_draw_c != CHARA_PLAYER ) {
-								if ( gdata(GDATA_FLAG_WORLD_MAP_VEHICLE_KIND) > 0 & mdata(MDATA_TYPE) == MAP_TYPE_WORLD | (gdata(GDATA_FLAG_SHIP_TYPE) > 0 & gdata(GDATA_AREA) == AREA_OCEAN) & cdata(CDATA_RELATION, locvar_cell_show_c) == RELATION_ALLY ) {
+								if ( gdata(GDATA_FLAG_WORLD_MAP_VEHICLE_KIND) > 0 & mdata(MDATA_TYPE) == MAP_TYPE_WORLD | (gdata(GDATA_FLAG_SHIP_TYPE) > 0 & gdata(GDATA_AREA) == AREA_OCEAN & gdata(MDATA_TYPE) = MAP_TYPE_WORLD) & cdata(CDATA_RELATION, locvar_cell_show_c) == RELATION_ALLY ) {
 									locvar_cell_draw_c = 0
 								}
 							}

2.05-custom-gx/proc.hsp

@@ -15125,6 +15125,7 @@
 			snd SOUNDLIST_PAYGOLD1
 			cdata(CDATA_GOLD, tc) -= cost
 			snd SOUNDLIST_DING1
+			umimass = 1
 			if ( inv(INV_ITEM_ID, ci) == ITEM_ID_DEED_OF_HUGE_RAFT ) {
 				gdata(GDATA_FLAG_SHIP_TYPE) = 1
 			}

2.05-custom-gx/screen.hsp

@@ -2226,7 +2226,7 @@
 		_switch_sw = 0
 
 		/********** CUSTOM SPELL ANIMATION - BEGINNING **********/
-		if ( TweakData(TWEAK_GAMEPLAY_CUSTOM_SPELL_ANIMATIONS, TWEAK_CATEGORY_GAMEPLAY) != 0 & animeid == ANIMATION_BALL ) {
+		if ( TweakData(TWEAK_MISC_CUSTOM_SPELL_ANIMATIONS, TWEAK_CATEGORY_MISC) != 0 & animeid == ANIMATION_BALL ) {
 			if ( efid == SKILL_SPELL_FIRE_BALL | efid == SKILL_SPELL_ICE_BALL | efid == SKILL_SPELL_THUNDER_VORTEX | efid == SKILL_SPELL_ECLIPSE | efid == SKILL_SPELL_ILLUSION_ROAR | efid == SKILL_SPELL_POISON_STORM | efid == SKILL_SPELL_NETHER_WAVE | efid == SKILL_SPELL_RAGING_ROAR | efid == SKILL_SPELL_ANGUISH_JAIL | efid == SKILL_SPELL_CHAOS_BALL | efid == SKILL_SPELL_MAGIC_STORM | efid == SKILL_SPELL_BUBBLE_STORM ) {
 				gosub *custom_spell_animation_ball
 				goto *anime_SWEND1
@@ -2338,7 +2338,7 @@
 		preparePicItem 3, anicol
 
 		/********** CUSTOM SPELL ANIMATION - BEGINNING **********/
-		if ( TweakData(TWEAK_GAMEPLAY_CUSTOM_SPELL_ANIMATIONS, TWEAK_CATEGORY_GAMEPLAY) != 0 ) {
+		if ( TweakData(TWEAK_MISC_CUSTOM_SPELL_ANIMATIONS, TWEAK_CATEGORY_MISC) != 0 ) {
 			if ( efid == SKILL_SPELL_FIRE_BOLT | efid == SKILL_SPELL_ICE_BOLT | efid == SKILL_SPELL_LIGHTNING_BOLT | efid == SKILL_SPELL_DARKNESS_BOLT | efid == SKILL_SPELL_MIND_BOLT | efid == SKILL_SPELL_POISON_BOLT | efid == SKILL_SPELL_NETHER_BOLT | efid == SKILL_SPELL_SOUND_BOLT | efid == SKILL_SPELL_NERVE_BOLT | efid == SKILL_SPELL_CHAOS_BOLT | efid == SKILL_SPELL_CRYSTAL_SPEAR | efid == SKILL_SPELL_WATER_BOLT ) {
 				gosub *custom_spell_animation_bolt
 				goto *anime_SWEND1
@@ -2620,7 +2620,7 @@
 		}
 
 		/********** CUSTOM SPELL ANIMATION - BEGINNING **********/
-		if ( TweakData(TWEAK_GAMEPLAY_CUSTOM_SPELL_ANIMATIONS, TWEAK_CATEGORY_GAMEPLAY) != 0 & animeid == ANIMATION_ARROW ) {
+		if ( TweakData(TWEAK_MISC_CUSTOM_SPELL_ANIMATIONS, TWEAK_CATEGORY_MISC) != 0 & animeid == ANIMATION_ARROW ) {
 			if ( efid == SKILL_SPELL_FIRE_CLAW | efid == SKILL_SPELL_COLD_BLADE | efid == SKILL_SPELL_LIGHTNING_SPEAR | efid == SKILL_SPELL_DARK_EYE | efid == SKILL_SPELL_MIND_THORN | efid == SKILL_SPELL_POISON_MUCUS | efid == SKILL_SPELL_NETHER_ARROW | efid == SKILL_SPELL_SOUND_CANNONBALL | efid == SKILL_SPELL_NERVE_ARROW | efid == SKILL_SPELL_CHAOS_EYE | efid == SKILL_SPELL_MAGIC_DART | efid == SKILL_SPELL_HYDRO_FANG ) {
 				gosub *custom_spell_animation_dart
 				goto *anime_SWEND1