diff --git a/tools/resmap/resources.csv b/tools/resmap/resources.csv
index a047e500e..d0a0254a8 100644
--- a/tools/resmap/resources.csv
+++ b/tools/resmap/resources.csv
@@ -449,11 +449,11 @@ sc2code/comm/druuge/ifontres.h,starcon.ls2,DRUUGE_FONT,504,1,3,comm.druuge.font,
 sc2code/comm/druuge/istrtab.h,starcon.ls2,DRUUGE_CONVERSATION_PHRASES,504,2,4,comm.druuge.dialogue,CONVERSATION,base/comm/druuge/druuge.txt
 sc2code/comm/druuge/istrtab.h,starcon.ls2,DRUUGE_COLOR_MAP,504,3,4,comm.druuge.colortable,BINTAB,base/comm/druuge/druuge.ct
 sc2code/comm/druuge/igfxres.h,starcon.ls2,DRUUGE_PMAP_ANIM,504,4,2,comm.druuge.graphics,GFXRES,base/comm/druuge/druuge.ani
-sc2code/comm/slyland/imusicre.h,starcon.ls2,SLYLAND_MUSIC,512,0,6,comm.slylandro.music,MUSICRES,base/comm/slyland/slyland.mod
-sc2code/comm/slyland/ifontres.h,starcon.ls2,SLYLAND_FONT,512,1,3,comm.slylandro.font,FONTRES,base/fonts/slyland.fon
-sc2code/comm/slyland/istrtab.h,starcon.ls2,SLYLAND_CONVERSATION_PHRASES,512,2,4,comm.slylandro.dialogue,CONVERSATION,base/comm/slyland/slyland.txt
-sc2code/comm/slyland/istrtab.h,starcon.ls2,SLYLAND_COLOR_MAP,512,3,4,comm.slylandro.colortable,BINTAB,base/comm/slyland/slyland.ct
-sc2code/comm/slyland/igfxres.h,starcon.ls2,SLYLAND_PMAP_ANIM,512,4,2,comm.slylandro.graphics,GFXRES,base/comm/slyland/slyland.ani
+sc2code/comm/slyland/imusicre.h,starcon.ls2,SLYLAND_MUSIC,512,0,6,comm.slylandro.music,MUSICRES,base/comm/slylandro/slylandro.mod
+sc2code/comm/slyland/ifontres.h,starcon.ls2,SLYLAND_FONT,512,1,3,comm.slylandro.font,FONTRES,base/fonts/slylandro.fon
+sc2code/comm/slyland/istrtab.h,starcon.ls2,SLYLAND_CONVERSATION_PHRASES,512,2,4,comm.slylandro.dialogue,CONVERSATION,base/comm/slylandro/slylandro.txt
+sc2code/comm/slyland/istrtab.h,starcon.ls2,SLYLAND_COLOR_MAP,512,3,4,comm.slylandro.colortable,BINTAB,base/comm/slylandro/slylandro.ct
+sc2code/comm/slyland/igfxres.h,starcon.ls2,SLYLAND_PMAP_ANIM,512,4,2,comm.slylandro.graphics,GFXRES,base/comm/slylandro/slylandro.ani
 sc2code/comm/utwig/imusicre.h,starcon.ls2,UTWIG_MUSIC,520,0,6,comm.utwig.music,MUSICRES,base/comm/utwig/utwig.mod
 sc2code/comm/utwig/imusicre.h,starcon.ls2,UTWIG_ULTRON_MUSIC,520,1,6,comm.utwigult.music,--,--
 sc2code/comm/utwig/ifontres.h,starcon.ls2,UTWIG_FONT,520,2,3,comm.utwig.font,FONTRES,base/fonts/utwig.fon
@@ -480,11 +480,11 @@ sc2code/comm/slyhome/ifontres.h,starcon.ls2,SLYLANDRO_FONT,511,1,3,comm.slyhome.
 sc2code/comm/slyhome/istrtab.h,starcon.ls2,SLYLANDRO_CONVERSATION_PHRASES,511,2,4,comm.slyhome.dialogue,CONVERSATION,base/comm/slyhome/slyhome.txt
 sc2code/comm/slyhome/istrtab.h,starcon.ls2,SLYLANDRO_COLOR_MAP,511,3,4,comm.slyhome.colortable,BINTAB,base/comm/slyhome/slyhome.ct
 sc2code/comm/slyhome/igfxres.h,starcon.ls2,SLYLANDRO_PMAP_ANIM,511,4,2,comm.slyhome.graphics,GFXRES,base/comm/slyhome/slyhome.ani
-sc2code/comm/zoqfot/imusicre.h,starcon.ls2,ZOQFOTPIK_MUSIC,523,0,6,comm.zoqfotpik.music,MUSICRES,base/comm/zoqfot/zoqfot.mod
-sc2code/comm/zoqfot/ifontres.h,starcon.ls2,ZOQFOTPIK_FONT,523,1,3,comm.zoqfotpik.font,FONTRES,base/fonts/zoqfot.fon
-sc2code/comm/zoqfot/istrtab.h,starcon.ls2,ZOQFOTPIK_CONVERSATION_PHRASES,523,2,4,comm.zoqfotpik.dialogue,CONVERSATION,base/comm/zoqfot/zoqfot.txt
-sc2code/comm/zoqfot/istrtab.h,starcon.ls2,ZOQFOTPIK_COLOR_MAP,523,3,4,comm.zoqfotpik.colortable,BINTAB,base/comm/zoqfot/zoqfot.ct
-sc2code/comm/zoqfot/igfxres.h,starcon.ls2,ZOQFOTPIK_PMAP_ANIM,523,4,2,comm.zoqfotpik.graphics,GFXRES,base/comm/zoqfot/zoqfot.ani
+sc2code/comm/zoqfot/imusicre.h,starcon.ls2,ZOQFOTPIK_MUSIC,523,0,6,comm.zoqfotpik.music,MUSICRES,base/comm/zoqfotpik/zoqfotpik.mod
+sc2code/comm/zoqfot/ifontres.h,starcon.ls2,ZOQFOTPIK_FONT,523,1,3,comm.zoqfotpik.font,FONTRES,base/fonts/zoqfotpik.fon
+sc2code/comm/zoqfot/istrtab.h,starcon.ls2,ZOQFOTPIK_CONVERSATION_PHRASES,523,2,4,comm.zoqfotpik.dialogue,CONVERSATION,base/comm/zoqfotpik/zoqfotpik.txt
+sc2code/comm/zoqfot/istrtab.h,starcon.ls2,ZOQFOTPIK_COLOR_MAP,523,3,4,comm.zoqfotpik.colortable,BINTAB,base/comm/zoqfotpik/zoqfotpik.ct
+sc2code/comm/zoqfot/igfxres.h,starcon.ls2,ZOQFOTPIK_PMAP_ANIM,523,4,2,comm.zoqfotpik.graphics,GFXRES,base/comm/zoqfotpik/zoqfotpik.ani
 sc2code/comm/vux/imusicre.h,starcon.ls2,VUX_MUSIC,521,0,6,comm.vux.music,MUSICRES,base/comm/vux/vux.mod
 sc2code/comm/vux/ifontres.h,starcon.ls2,VUX_FONT,521,1,3,comm.vux.font,FONTRES,base/fonts/vux.fon
 sc2code/comm/vux/istrtab.h,starcon.ls2,VUX_CONVERSATION_PHRASES,521,2,4,comm.vux.dialogue,CONVERSATION,base/comm/vux/vux.txt
@@ -495,14 +495,14 @@ sc2code/comm/arilou/ifontres.h,starcon.ls2,ARILOU_FONT,500,1,3,comm.arilou.font,
 sc2code/comm/arilou/istrtab.h,starcon.ls2,ARILOU_CONVERSATION_PHRASES,500,2,4,comm.arilou.dialogue,CONVERSATION,base/comm/arilou/arilou.txt
 sc2code/comm/arilou/igfxres.h,starcon.ls2,ARILOU_PMAP_ANIM,500,3,2,comm.arilou.graphics,GFXRES,base/comm/arilou/arilou.ani
 sc2code/comm/arilou/igfxres.h,starcon.ls2,ARILOU_COLOR_MAP,500,4,4,comm.arilou.colortable,BINTAB,base/comm/arilou/arilou.ct
-sc2code/comm/comandr/imusicre.h,starcon.ls2,COMMANDER_MUSIC,503,0,6,comm.commander.music,MUSICRES,base/comm/comandr/comandr.mod
+sc2code/comm/comandr/imusicre.h,starcon.ls2,COMMANDER_MUSIC,503,0,6,comm.commander.music,MUSICRES,base/comm/commander/commander.mod
 sc2code/comm/comandr/imusicre.h,starcon.ls2,STARBASE_ALT_MUSIC,503,1,6,comm.starbase.music,--,--
 sc2code/comm/comandr/imusicre.h,starcon.ls2,COMMANDER_LOWPOW_MUSIC,503,2,6,comm.comlowpw.music,--,--
-sc2code/comm/comandr/ifontres.h,starcon.ls2,COMMANDER_FONT,503,3,3,comm.commander.font,FONTRES,base/fonts/comandr.fon
-sc2code/comm/comandr/istrtab.h,starcon.ls2,COMMANDER_COLOR_MAP,503,4,4,comm.commander.colortable,BINTAB,base/comm/comandr/comandr.ct
-sc2code/comm/comandr/istrtab.h,starcon.ls2,COMMANDER_CONVERSATION_PHRASES,503,5,4,comm.commander.dialogue,CONVERSATION,base/comm/comandr/comandr.txt
-sc2code/comm/comandr/istrtab.h,starcon.ls2,STARBASE_CONVERSATION_PHRASES,503,6,4,comm.starbase.dialogue,CONVERSATION,base/comm/starbas/starbas.txt
-sc2code/comm/comandr/igfxres.h,starcon.ls2,COMMANDER_PMAP_ANIM,503,7,2,comm.commander.graphics,GFXRES,base/comm/comandr/comandr.ani
+sc2code/comm/comandr/ifontres.h,starcon.ls2,COMMANDER_FONT,503,3,3,comm.commander.font,FONTRES,base/fonts/commander.fon
+sc2code/comm/comandr/istrtab.h,starcon.ls2,COMMANDER_COLOR_MAP,503,4,4,comm.commander.colortable,BINTAB,base/comm/commander/commander.ct
+sc2code/comm/comandr/istrtab.h,starcon.ls2,COMMANDER_CONVERSATION_PHRASES,503,5,4,comm.commander.dialogue,CONVERSATION,base/comm/commander/commander.txt
+sc2code/comm/comandr/istrtab.h,starcon.ls2,STARBASE_CONVERSATION_PHRASES,503,6,4,comm.starbase.dialogue,CONVERSATION,base/comm/starbase/starbase.txt
+sc2code/comm/comandr/igfxres.h,starcon.ls2,COMMANDER_PMAP_ANIM,503,7,2,comm.commander.graphics,GFXRES,base/comm/commander/commander.ani
 sc2code/comm/spathi/imusicre.h,starcon.ls2,SPATHI_MUSIC,513,0,6,comm.spathi.music,MUSICRES,base/comm/spathi/spathi.mod
 sc2code/comm/spathi/imusicre.h,starcon.ls2,SPAHOME_MUSIC,513,1,6,comm.spahome.music,MUSICRES,base/comm/spathi/spathi.mod
 sc2code/comm/spathi/imusicre.h,starcon.ls2,FWIFFO_MUSIC,513,2,6,comm.spafwiff.music,--,--
@@ -518,11 +518,11 @@ sc2code/comm/pkunk/ifontres.h,starcon.ls2,PKUNK_FONT,509,1,3,comm.pkunk.font,FON
 sc2code/comm/pkunk/istrtab.h,starcon.ls2,PKUNK_CONVERSATION_PHRASES,509,2,4,comm.pkunk.dialogue,CONVERSATION,base/comm/pkunk/pkunk.txt
 sc2code/comm/pkunk/istrtab.h,starcon.ls2,PKUNK_COLOR_MAP,509,3,4,comm.pkunk.colortable,BINTAB,base/comm/pkunk/pkunk.ct
 sc2code/comm/pkunk/igfxres.h,starcon.ls2,PKUNK_PMAP_ANIM,509,4,2,comm.pkunk.graphics,GFXRES,base/comm/pkunk/pkunk.ani
-sc2code/comm/shofixt/imusicre.h,starcon.ls2,SHOFIXTI_MUSIC,510,0,6,comm.shofixti.music,MUSICRES,base/comm/shofixt/shofixt.mod
-sc2code/comm/shofixt/ifontres.h,starcon.ls2,SHOFIXTI_FONT,510,1,3,comm.shofixti.font,FONTRES,base/fonts/shofixt.fon
-sc2code/comm/shofixt/istrtab.h,starcon.ls2,SHOFIXTI_CONVERSATION_PHRASES,510,2,4,comm.shofixti.dialogue,CONVERSATION,base/comm/shofixt/shofixt.txt
-sc2code/comm/shofixt/istrtab.h,starcon.ls2,SHOFIXTI_COLOR_MAP,510,3,4,comm.shofixti.colortable,BINTAB,base/comm/shofixt/shofixt.ct
-sc2code/comm/shofixt/igfxres.h,starcon.ls2,SHOFIXTI_PMAP_ANIM,510,4,2,comm.shofixti.graphics,GFXRES,base/comm/shofixt/shofixt.ani
+sc2code/comm/shofixt/imusicre.h,starcon.ls2,SHOFIXTI_MUSIC,510,0,6,comm.shofixti.music,MUSICRES,base/comm/shofixti/shofixti.mod
+sc2code/comm/shofixt/ifontres.h,starcon.ls2,SHOFIXTI_FONT,510,1,3,comm.shofixti.font,FONTRES,base/fonts/shofixti.fon
+sc2code/comm/shofixt/istrtab.h,starcon.ls2,SHOFIXTI_CONVERSATION_PHRASES,510,2,4,comm.shofixti.dialogue,CONVERSATION,base/comm/shofixti/shofixti.txt
+sc2code/comm/shofixt/istrtab.h,starcon.ls2,SHOFIXTI_COLOR_MAP,510,3,4,comm.shofixti.colortable,BINTAB,base/comm/shofixti/shofixti.ct
+sc2code/comm/shofixt/igfxres.h,starcon.ls2,SHOFIXTI_PMAP_ANIM,510,4,2,comm.shofixti.graphics,GFXRES,base/comm/shofixti/shofixti.ani
 sc2code/comm/umgah/imusicre.h,starcon.ls2,UMGAH_MUSIC,518,0,6,comm.umgah.music,MUSICRES,base/comm/umgah/umgah.mod
 sc2code/comm/umgah/ifontres.h,starcon.ls2,UMGAH_FONT,518,1,3,comm.umgah.font,FONTRES,base/fonts/umgah.fon
 sc2code/comm/umgah/istrtab.h,starcon.ls2,UMGAH_CONVERSATION_PHRASES,518,2,4,comm.umgah.dialogue,CONVERSATION,base/comm/umgah/umgah.txt
@@ -538,26 +538,26 @@ sc2code/comm/syreen/ifontres.h,starcon.ls2,SYREEN_FONT,515,1,3,comm.syreen.font,
 sc2code/comm/syreen/istrtab.h,starcon.ls2,SYREEN_CONVERSATION_PHRASES,515,2,4,comm.syreen.dialogue,CONVERSATION,base/comm/syreen/syreen.txt
 sc2code/comm/syreen/istrtab.h,starcon.ls2,SYREEN_COLOR_MAP,515,3,4,comm.syreen.colortable,BINTAB,base/comm/syreen/syreen.ct
 sc2code/comm/syreen/igfxres.h,starcon.ls2,SYREEN_PMAP_ANIM,515,4,2,comm.syreen.graphics,GFXRES,base/comm/syreen/syreen.ani
-sc2code/comm/melnorm/imusicre.h,starcon.ls2,MELNORME_MUSIC,506,0,6,comm.melnorme.music,MUSICRES,base/comm/melnorm/melnorm.mod
-sc2code/comm/melnorm/ifontres.h,starcon.ls2,MELNORME_FONT,506,1,3,comm.melnorme.font,FONTRES,base/fonts/melnorm.fon
-sc2code/comm/melnorm/istrtab.h,starcon.ls2,MELNORME_CONVERSATION_PHRASES,506,2,4,comm.melnorme.dialogue,CONVERSATION,base/comm/melnorm/melnorm.txt
-sc2code/comm/melnorm/istrtab.h,starcon.ls2,MELNORME_COLOR_MAP,506,3,4,comm.melnorme.colortable,BINTAB,base/comm/melnorm/melnorm.ct
-sc2code/comm/melnorm/igfxres.h,starcon.ls2,MELNORME_PMAP_ANIM,506,4,2,comm.melnorme.graphics,GFXRES,base/comm/melnorm/melnorm.ani
-sc2code/comm/blackur/imusicre.h,starcon.ls2,BLACKURQ_MUSIC,501,0,6,comm.kohrah.music,MUSICRES,base/comm/blackur/blackur.mod
+sc2code/comm/melnorm/imusicre.h,starcon.ls2,MELNORME_MUSIC,506,0,6,comm.melnorme.music,MUSICRES,base/comm/melnorme/melnorme.mod
+sc2code/comm/melnorm/ifontres.h,starcon.ls2,MELNORME_FONT,506,1,3,comm.melnorme.font,FONTRES,base/fonts/melnorme.fon
+sc2code/comm/melnorm/istrtab.h,starcon.ls2,MELNORME_CONVERSATION_PHRASES,506,2,4,comm.melnorme.dialogue,CONVERSATION,base/comm/melnorme/melnorme.txt
+sc2code/comm/melnorm/istrtab.h,starcon.ls2,MELNORME_COLOR_MAP,506,3,4,comm.melnorme.colortable,BINTAB,base/comm/melnorme/melnorme.ct
+sc2code/comm/melnorm/igfxres.h,starcon.ls2,MELNORME_PMAP_ANIM,506,4,2,comm.melnorme.graphics,GFXRES,base/comm/melnorme/melnorme.ani
+sc2code/comm/blackur/imusicre.h,starcon.ls2,BLACKURQ_MUSIC,501,0,6,comm.kohrah.music,MUSICRES,base/comm/kohrah/kohrah.mod
 sc2code/comm/blackur/ifontres.h,starcon.ls2,BLACKURQ_FONT,501,1,3,comm.kohrah.font,FONTRES,base/fonts/kohrah.fon
-sc2code/comm/blackur/istrtab.h,starcon.ls2,BLACKURQ_CONVERSATION_PHRASES,501,2,4,comm.kohrah.dialogue,CONVERSATION,base/comm/blackur/blackur.txt
-sc2code/comm/blackur/istrtab.h,starcon.ls2,BLACKURQ_COLOR_MAP,501,3,4,comm.kohrah.colortable,BINTAB,base/comm/blackur/blackur.ct
-sc2code/comm/blackur/igfxres.h,starcon.ls2,BLACKURQ_PMAP_ANIM,501,4,2,comm.kohrah.graphics,GFXRES,base/comm/blackur/blackur.ani
-sc2code/comm/talkpet/imusicre.h,starcon.ls2,TALKING_PET_MUSIC,516,0,6,comm.talkingpet.music,MUSICRES,base/comm/talkpet/talkpet.mod
-sc2code/comm/talkpet/ifontres.h,starcon.ls2,TALKING_PET_FONT,516,1,3,comm.talkingpet.font,FONTRES,base/fonts/talkpet.fon
-sc2code/comm/talkpet/istrtab.h,starcon.ls2,TALKING_PET_CONVERSATION_PHRASES,516,2,4,comm.talkingpet.dialogue,CONVERSATION,base/comm/talkpet/talkpet.txt
-sc2code/comm/talkpet/istrtab.h,starcon.ls2,TALKING_PET_COLOR_MAP,516,3,4,comm.talkingpet.colortable,BINTAB,base/comm/talkpet/talkpet.ct
-sc2code/comm/talkpet/igfxres.h,starcon.ls2,TALKING_PET_PMAP_ANIM,516,4,2,comm.talkingpet.graphics,GFXRES,base/comm/talkpet/talkpet.ani
+sc2code/comm/blackur/istrtab.h,starcon.ls2,BLACKURQ_CONVERSATION_PHRASES,501,2,4,comm.kohrah.dialogue,CONVERSATION,base/comm/kohrah/kohrah.txt
+sc2code/comm/blackur/istrtab.h,starcon.ls2,BLACKURQ_COLOR_MAP,501,3,4,comm.kohrah.colortable,BINTAB,base/comm/kohrah/kohrah.ct
+sc2code/comm/blackur/igfxres.h,starcon.ls2,BLACKURQ_PMAP_ANIM,501,4,2,comm.kohrah.graphics,GFXRES,base/comm/kohrah/kohrah.ani
+sc2code/comm/talkpet/imusicre.h,starcon.ls2,TALKING_PET_MUSIC,516,0,6,comm.talkingpet.music,MUSICRES,base/comm/talkingpet/talkingpet.mod
+sc2code/comm/talkpet/ifontres.h,starcon.ls2,TALKING_PET_FONT,516,1,3,comm.talkingpet.font,FONTRES,base/fonts/talkingpet.fon
+sc2code/comm/talkpet/istrtab.h,starcon.ls2,TALKING_PET_CONVERSATION_PHRASES,516,2,4,comm.talkingpet.dialogue,CONVERSATION,base/comm/talkingpet/talkingpet.txt
+sc2code/comm/talkpet/istrtab.h,starcon.ls2,TALKING_PET_COLOR_MAP,516,3,4,comm.talkingpet.colortable,BINTAB,base/comm/talkingpet/talkingpet.ct
+sc2code/comm/talkpet/igfxres.h,starcon.ls2,TALKING_PET_PMAP_ANIM,516,4,2,comm.talkingpet.graphics,GFXRES,base/comm/talkingpet/talkingpet.ani
 sc2code/comm/yehat/imusicre.h,starcon.ls2,YEHAT_MUSIC,522,0,6,comm.yehat.music,MUSICRES,base/comm/yehat/yehat.mod
 sc2code/comm/yehat/imusicre.h,starcon.ls2,REBEL_MUSIC,522,1,6,comm.yehat.rebel.music,--,--
 sc2code/comm/yehat/ifontres.h,starcon.ls2,YEHAT_FONT,522,2,3,comm.yehat.font,FONTRES,base/fonts/yehat.fon
 sc2code/comm/yehat/istrtab.h,starcon.ls2,YEHAT_CONVERSATION_PHRASES,522,3,4,comm.yehat.dialogue,CONVERSATION,base/comm/yehat/yehat.txt
-sc2code/comm/yehat/istrtab.h,starcon.ls2,REBEL_CONVERSATION_PHRASES,522,4,4,comm.yehat.rebel.dialogue,CONVERSATION,base/comm/rebel/rebel.txt
+sc2code/comm/yehat/istrtab.h,starcon.ls2,REBEL_CONVERSATION_PHRASES,522,4,4,comm.yehat.rebel.dialogue,CONVERSATION,base/comm/yehatrebels/yehatrebels.txt
 sc2code/comm/yehat/istrtab.h,starcon.ls2,YEHAT_COLOR_MAP,522,5,4,comm.yehat.colortable,BINTAB,base/comm/yehat/yehat.ct
 sc2code/comm/yehat/igfxres.h,starcon.ls2,YEHAT_PMAP_ANIM,522,6,2,comm.yehat.graphics,GFXRES,base/comm/yehat/yehat.ani
 sc2code/comm/supox/imusicre.h,starcon.ls2,SUPOX_MUSIC,514,0,6,comm.supox.music,MUSICRES,base/comm/supox/supox.mod
@@ -565,11 +565,11 @@ sc2code/comm/supox/ifontres.h,starcon.ls2,SUPOX_FONT,514,1,3,comm.supox.font,FON
 sc2code/comm/supox/istrtab.h,starcon.ls2,SUPOX_CONVERSATION_PHRASES,514,2,4,comm.supox.dialogue,CONVERSATION,base/comm/supox/supox.txt
 sc2code/comm/supox/istrtab.h,starcon.ls2,SUPOX_COLOR_MAP,514,3,4,comm.supox.colortable,BINTAB,base/comm/supox/supox.ct
 sc2code/comm/supox/igfxres.h,starcon.ls2,SUPOX_PMAP_ANIM,514,4,2,comm.supox.graphics,GFXRES,base/comm/supox/supox.ani
-sc2code/comm/thradd/imusicre.h,starcon.ls2,THRADD_MUSIC,517,0,6,comm.thraddash.music,MUSICRES,base/comm/thradd/thradd.mod
-sc2code/comm/thradd/ifontres.h,starcon.ls2,THRADD_FONT,517,1,3,comm.thraddash.font,FONTRES,base/fonts/thradd.fon
-sc2code/comm/thradd/istrtab.h,starcon.ls2,THRADD_CONVERSATION_PHRASES,517,2,4,comm.thraddash.dialogue,CONVERSATION,base/comm/thradd/thradd.txt
-sc2code/comm/thradd/istrtab.h,starcon.ls2,THRADD_COLOR_MAP,517,3,4,comm.thraddash.colortable,BINTAB,base/comm/thradd/thradd.ct
-sc2code/comm/thradd/igfxres.h,starcon.ls2,THRADD_PMAP_ANIM,517,4,2,comm.thraddash.graphics,GFXRES,base/comm/thradd/thradd.ani
+sc2code/comm/thradd/imusicre.h,starcon.ls2,THRADD_MUSIC,517,0,6,comm.thraddash.music,MUSICRES,base/comm/thraddash/thraddash.mod
+sc2code/comm/thradd/ifontres.h,starcon.ls2,THRADD_FONT,517,1,3,comm.thraddash.font,FONTRES,base/fonts/thraddash.fon
+sc2code/comm/thradd/istrtab.h,starcon.ls2,THRADD_CONVERSATION_PHRASES,517,2,4,comm.thraddash.dialogue,CONVERSATION,base/comm/thraddash/thraddash.txt
+sc2code/comm/thradd/istrtab.h,starcon.ls2,THRADD_COLOR_MAP,517,3,4,comm.thraddash.colortable,BINTAB,base/comm/thraddash/thraddash.ct
+sc2code/comm/thradd/igfxres.h,starcon.ls2,THRADD_PMAP_ANIM,517,4,2,comm.thraddash.graphics,GFXRES,base/comm/thraddash/thraddash.ani
 sc2code/comm/orz/imusicre.h,starcon.ls2,ORZ_MUSIC,508,0,6,comm.orz.music,MUSICRES,base/comm/orz/orz.mod
 sc2code/comm/orz/ifontres.h,starcon.ls2,ORZ_FONT,508,1,3,comm.orz.font,FONTRES,base/fonts/orz.fon
 sc2code/comm/orz/istrtab.h,starcon.ls2,ORZ_CONVERSATION_PHRASES,508,2,4,comm.orz.dialogue,CONVERSATION,base/comm/orz/orz.txt
diff --git a/tools/resmap/reverse_rmp.py b/tools/resmap/reverse_rmp.py
new file mode 100644
index 000000000..35a6abc22
--- /dev/null
+++ b/tools/resmap/reverse_rmp.py
@@ -0,0 +1,35 @@
+#!/usr/bin/python
+
+import sys
+import os.path
+from gen_resfiles import *
+
+rmp_file = file(os.path.join("../../sc2/content/uqm.rmp"))
+
+def load_rmp(dat):
+	result = {}
+	for line in dat:
+		try:
+			(src, dest) = line.split('=', 1)
+			(t, v) = dest.split(':', 1)
+			result[src.strip()] = (t.strip(), v.strip())
+		except ValueError:
+			print>>sys.stderr, "Warning: unparseable line "+line
+	return result
+	
+csv_data = read_csv()
+rmp_data = load_rmp(rmp_file)
+
+for elt in csv_data:
+	s = elt.res_id
+	t = elt.res_type
+	v = elt.res_file
+	if s in rmp_data and rmp_data[s] != (t, v):
+		(nt, nv) = rmp_data[s]
+		print>>sys.stderr, "Changing %s to %s:%s" % (s, nt, nv)
+		elt.res_type = nt
+		elt.res_file = nv
+
+outfile = file("resources.csv", "wt")
+for elt in csv_data:
+	print>>outfile, elt.csv_line()