Red Firefleas IBJ into HBJ, remove X-Ray Room references#2239

kjbranch merged 2 commits intovg-json-data:mastervg-json-data/sm-json-data:masterfrom

kjbranch:ibj-hbjkjbranch/sm-json-data:ibj-hbjCopy head branch name to clipboard